Release Catima 2.23.3

Translations update from Hosted Weblate

.github/workflows/android.yml

@@ -3,12 +3,12 @@ name: Android CI
 on:
   push:
     branches:
-      - master
+      - main
       - staging
       - trying
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   build:
@@ -20,11 +20,11 @@ jobs:
     - name: Fail on bad translations
       run: if grep -ri "<xliff" app/src/main/res/values*/strings.xml; then echo "Invalidly escaped translations found"; exit 1; fi
     - uses: gradle/wrapper-validation-action@v1
-    - name: set up JDK 11
+    - name: set up JDK 17
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
-        java-version: '11'
+        distribution: 'temurin'
+        java-version: '17'
     - name: Build
       run: ./gradlew assembleRelease
     - name: Check lint

.github/workflows/calibreapp-image-actions.yml

@@ -1,8 +1,8 @@
-name: Compress Images on Push to Master
+name: Compress Images on Push to Main
 on:
   push:
     branches:
-      - master
+      - main
     paths:
       - '**.jpg'
       - '**.jpeg'

.github/workflows/changelog-to-fastlane.yml

@@ -2,7 +2,7 @@ name: Convert CHANGELOG to Fastlane
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   convert_changelog_to_fastlane:

.github/workflows/contributors-to-file.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   contributors_to_file:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main'
     name: Write contributors to file
     steps:
     - name: Checkout repo

.github/workflows/gradle-wrapper-validation.yml

@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: gradle/wrapper-validation-action@v1

.gitignore

@@ -8,3 +8,8 @@ captures/
 **/release
 **/debug
 app/*.log
+
+# Bundle
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/

CHANGELOG.md

@@ -1,5 +1,45 @@
 # Changelog
 
+## v2.23.3 - 123
+
+- Minor UI improvements
+- Fix new design not being usable on devices with square screens
+
+## v2.23.2 - 122
+
+- Long-press card icon in view activity to change it
+- Improve button styling in Groups screen
+- Fix long barcode values causing barcode to scale down to nothing
+
+## v2.23.1 - 121
+
+- Update used libraries
+
+## v2.23.0 - 120
+
+- Complete redesign of main and loyalty card view screens
+- Material You design for the settings screen
+- Fix crash when using "Take a photo" with disabled camera app
+
+## v2.22.1 - 119
+
+- Use Material You colours on more devices (Google library update)
+
+## v2.22.0 - 118
+
+- Support setting start of card validity
+- Fix Stocard import (Stocard's export format changed)
+
+## v2.21.2 - 117
+
+- Remove unnecessary permissions
+- Target Android 13
+
+## v2.21.1 - 116
+
+- Fix quick spend dialog not allowing , separator
+- Support loading image from file manager
+
 ## v2.21.0 - 115
 
 - Open image in gallery on long-press
@@ -599,7 +639,7 @@ Additional features/improvements:
 ## v0.7 - 7 (2016-07-14)
 
 - Long-click of a card brings up option to copy card ID to the clipboard. ([pull #49](https://github.com/brarcher/loyalty-card-locker/issues/49))
-- Back button on Input/Export view now works, moving user to main view
+- Back button on Import/Export view now works, moving user to main view
 
 ## v0.6 - 6 (2016-05-23)
 

CONTRIBUTING.md

@@ -100,5 +100,5 @@ your real name, saying:
 Finally, you will need to submit your patches so that they can be reviewed
 and potentially merged into the main Catima repository. The preferred
 way to do this is to submit a Pull Request to the Catima project.
-Changes need to apply cleanly onto the master branch and pass all
+Changes need to apply cleanly onto the main branch and pass all
 unit tests and produce no errors during static analysis.

Gemfile.lock

@@ -1,27 +1,27 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.6)
       rexml
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.597.0)
-    aws-sdk-core (3.131.1)
+    aws-partitions (1.771.0)
+    aws-sdk-core (3.173.1)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.57.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.64.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.122.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -34,10 +34,10 @@ GEM
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
+    dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.92.3)
-    faraday (1.10.0)
+    excon (0.99.0)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -65,8 +65,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.206.2)
+    fastimage (2.2.7)
+    fastlane (2.213.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -90,7 +90,7 @@ GEM
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
       optparse (~> 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
@@ -106,9 +106,9 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.21.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.5.0)
+    google-apis-androidpublisher_v3 (0.42.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -117,27 +117,27 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.10.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.7.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.14.0)
-      google-apis-core (>= 0.4, < 2.a)
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.2.0)
-    google-cloud-storage (1.36.2)
+    google-cloud-errors (1.3.1)
+    google-cloud-storage (1.44.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.19.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.1.3)
+    googleauth (1.5.2)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -148,20 +148,20 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.6.1)
-    json (2.6.2)
-    jwt (2.4.1)
+    jmespath (1.6.2)
+    json (2.6.3)
+    jwt (2.7.0)
     memoist (0.16.2)
-    mini_magick (4.11.0)
+    mini_magick (4.12.0)
     mini_mime (1.1.2)
     multi_json (1.15.0)
-    multipart-post (2.0.0)
+    multipart-post (2.3.0)
     nanaimo (0.3.0)
     naturally (2.2.1)
     optparse (0.1.1)
     os (1.1.4)
-    plist (3.6.0)
-    public_suffix (4.0.7)
+    plist (3.7.0)
+    public_suffix (5.0.1)
     rake (13.0.6)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -173,12 +173,12 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.16.1)
+    signet (0.17.0)
       addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.0)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.8)
+    simctl (1.6.10)
       CFPropertyList
       naturally
     terminal-notifier (2.0.0)
@@ -194,9 +194,9 @@ GEM
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
-    webrick (1.7.0)
+    webrick (1.8.1)
     word_wrap (1.0.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -215,4 +215,4 @@ DEPENDENCIES
   fastlane
 
 BUNDLED WITH
-   2.1.4
+   2.3.26

app/build.gradle

@@ -13,14 +13,14 @@ spotbugs {
 }
 
 android {
-    compileSdk 31
+    compileSdk 33
 
     defaultConfig {
         applicationId "me.hackerchick.catima"
         minSdk 21
-        targetSdk 31
-        versionCode 115
-        versionName "2.21.0"
+        targetSdk 33
+        versionCode 123
+        versionName "2.23.3"
 
         vectorDrawables.useSupportLibrary true
         multiDexEnabled true
@@ -58,9 +58,6 @@ android {
         targetCompatibility JavaVersion.VERSION_11
     }
 
-    lintOptions {
-        lintConfig file("lint.xml")
-    }
 
     sourceSets {
         test {
@@ -80,37 +77,40 @@ android {
             includeAndroidResources true
         }
     }
+    lint {
+        lintConfig file('lint.xml')
+    }
+    namespace 'protect.card_locker'
 }
 
 dependencies {
 // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation 'androidx.exifinterface:exifinterface:1.3.3'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.exifinterface:exifinterface:1.3.6'
     implementation 'androidx.palette:palette:1.0.0'
     implementation 'androidx.preference:preference:1.2.0'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'com.github.yalantis:ucrop:2.2.8'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
 // Splash Screen
-    implementation 'androidx.core:core-splashscreen:1.0.0'
+    implementation 'androidx.core:core-splashscreen:1.0.1'
 
 // Third-party
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
-    implementation 'com.google.zxing:core:3.5.0'
+    implementation 'com.google.zxing:core:3.5.1'
     implementation 'org.apache.commons:commons-csv:1.9.0'
     implementation 'com.jaredrummler:colorpicker:1.1.0'
-    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.4'
-    implementation 'net.lingala.zip4j:zip4j:2.11.2'
+    implementation 'net.lingala.zip4j:zip4j:2.11.5'
 
 // SpotBugs
     implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
 
 // Testing
-    testImplementation 'androidx.test:core:1.4.0'
+    testImplementation 'androidx.test:core:1.5.0'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.9'
+    testImplementation 'org.robolectric:robolectric:4.10.3'
 }
 
 tasks.withType(SpotBugsTask) {

app/src/main/AndroidManifest.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="protect.card_locker">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
 
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="23" />
 
     <uses-feature
         android:name="android.hardware.camera"

app/src/main/java/protect/card_locker/AboutActivity.java

@@ -34,11 +34,18 @@ public class AboutActivity extends CatimaAppCompatActivity {
 
         binding.versionHistory.setTag("https://catima.app/changelog/");
         binding.translate.setTag("https://hosted.weblate.org/engage/catima/");
-        binding.license.setTag("https://github.com/CatimaLoyalty/Android/blob/master/LICENSE");
+        binding.license.setTag("https://github.com/CatimaLoyalty/Android/blob/main/LICENSE");
         binding.repo.setTag("https://github.com/CatimaLoyalty/Android/");
         binding.privacy.setTag("https://catima.app/privacy-policy/");
         binding.reportError.setTag("https://github.com/CatimaLoyalty/Android/issues");
         binding.rate.setTag("https://play.google.com/store/apps/details?id=me.hackerchick.catima");
+        binding.donate.setTag("https://catima.app/contribute/#donating");
+
+        boolean installedFromGooglePlay = Utils.installedFromGooglePlay(this);
+        // Hide Google Play rate button if not on Google Play
+        binding.rate.setVisibility(installedFromGooglePlay ? View.VISIBLE : View.GONE);
+        // Hide donate button on Google Play (Google Play doesn't allow donation links)
+        binding.donate.setVisibility(installedFromGooglePlay ? View.GONE : View.VISIBLE);
 
         bindClickListeners();
     }
@@ -74,6 +81,7 @@ public class AboutActivity extends CatimaAppCompatActivity {
         binding.privacy.setOnClickListener(openExternalBrowser);
         binding.reportError.setOnClickListener(openExternalBrowser);
         binding.rate.setOnClickListener(openExternalBrowser);
+        binding.donate.setOnClickListener(openExternalBrowser);
 
         binding.credits.setOnClickListener(view -> showCredits());
     }
@@ -86,6 +94,8 @@ public class AboutActivity extends CatimaAppCompatActivity {
         binding.privacy.setOnClickListener(null);
         binding.reportError.setOnClickListener(null);
         binding.rate.setOnClickListener(null);
+        binding.donate.setOnClickListener(null);
+
         binding.credits.setOnClickListener(null);
     }
 

app/src/main/java/protect/card_locker/BarcodeImageWriterResultCallback.java

@@ -0,0 +1,5 @@
+package protect.card_locker;
+
+public interface BarcodeImageWriterResultCallback {
+    void onBarcodeImageWriterResult(boolean success);
+}

app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java

@@ -42,12 +42,12 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
     private final int imageHeight;
     private final int imageWidth;
     private final boolean showFallback;
-    private final Runnable callback;
+    private final BarcodeImageWriterResultCallback callback;
 
     BarcodeImageWriterTask(
             Context context, ImageView imageView, String cardIdString,
             CatimaBarcode barcodeFormat, TextView textView,
-            boolean showFallback, Runnable callback, boolean roundCornerPadding
+            boolean showFallback, BarcodeImageWriterResultCallback callback, boolean roundCornerPadding
     ) {
         mContext = context;
 
@@ -282,7 +282,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
         }
 
         if (callback != null) {
-            callback.run();
+            callback.onBarcodeImageWriterResult(isSuccesful);
         }
     }
 

app/src/main/java/protect/card_locker/CardsOnPowerScreenService.java

@@ -1,6 +1,5 @@
 package protect.card_locker;
 
-import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -69,10 +68,9 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
             subscriber.onSubscribe(new NoOpSubscription());
             for (String controlId : controlIds) {
                 Control control;
-
-                try {
-                    Integer cardId = this.controlIdToCardId(controlId);
-                    LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, cardId);
+                Integer cardId = this.controlIdToCardId(controlId);
+                LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, cardId);
+                if (card != null) {
                     Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
                             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                             .putExtra("id", card.id);
@@ -85,7 +83,7 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
                             .setControlTemplate(new StatelessTemplate(controlId))
                             .setCustomIcon(Icon.createWithBitmap(getIcon(this, card)))
                             .build();
-                } catch (NullPointerException ignored) {
+                } else {
                     Intent mainScreenIntent = new Intent(this, MainActivity.class)
                             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     PendingIntent pendingIntent = PendingIntent.getActivity(getBaseContext(), -1, mainScreenIntent, PendingIntent.FLAG_IMMUTABLE);

app/src/main/java/protect/card_locker/CatimaAppCompatActivity.java

@@ -6,6 +6,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
@@ -49,4 +50,7 @@ public class CatimaAppCompatActivity extends AppCompatActivity {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
     }
+
+    public void onMockedRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    }
 }

app/src/main/java/protect/card_locker/DBHelper.java

@@ -21,7 +21,7 @@ import java.util.List;
 public class DBHelper extends SQLiteOpenHelper {
     public static final String DATABASE_NAME = "Catima.db";
     public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 15;
+    public static final int DATABASE_VERSION = 16;
 
     public static class LoyaltyCardDbGroups {
         public static final String TABLE = "groups";
@@ -33,6 +33,7 @@ public class DBHelper extends SQLiteOpenHelper {
         public static final String TABLE = "cards";
         public static final String ID = "_id";
         public static final String STORE = "store";
+        public static final String VALID_FROM = "validfrom";
         public static final String EXPIRY = "expiry";
         public static final String BALANCE = "balance";
         public static final String BALANCE_TYPE = "balancetype";
@@ -95,6 +96,7 @@ public class DBHelper extends SQLiteOpenHelper {
                 LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
                 LoyaltyCardDbIds.STORE + " TEXT not null," +
                 LoyaltyCardDbIds.NOTE + " TEXT not null," +
+                LoyaltyCardDbIds.VALID_FROM + " INTEGER," +
                 LoyaltyCardDbIds.EXPIRY + " INTEGER," +
                 LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
                 LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
@@ -314,6 +316,11 @@ public class DBHelper extends SQLiteOpenHelper {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' ");
         }
+
+        if (oldVersion < 16 && newVersion >= 16) {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.VALID_FROM + " INTEGER");
+        }
     }
 
     private static ContentValues generateFTSContentValues(final int id, final String store, final String note) {
@@ -358,8 +365,8 @@ public class DBHelper extends SQLiteOpenHelper {
     }
 
     public static long insertLoyaltyCard(
-            final SQLiteDatabase database, final String store, final String note, final Date expiry,
-            final BigDecimal balance, final Currency balanceType, final String cardId,
+            final SQLiteDatabase database, final String store, final String note, final Date validFrom,
+            final Date expiry, final BigDecimal balance, final Currency balanceType, final String cardId,
             final String barcodeId, final CatimaBarcode barcodeType, final Integer headerColor,
             final int starStatus, final Long lastUsed, final int archiveStatus) {
         database.beginTransaction();
@@ -368,6 +375,7 @@ public class DBHelper extends SQLiteOpenHelper {
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
+        contentValues.put(LoyaltyCardDbIds.VALID_FROM, validFrom != null ? validFrom.getTime() : null);
         contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
         contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
         contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
@@ -391,9 +399,10 @@ public class DBHelper extends SQLiteOpenHelper {
 
     public static long insertLoyaltyCard(
             final SQLiteDatabase database, final int id, final String store, final String note,
-            final Date expiry, final BigDecimal balance, final Currency balanceType,
-            final String cardId, final String barcodeId, final CatimaBarcode barcodeType,
-            final Integer headerColor, final int starStatus, final Long lastUsed, final int archiveStatus) {
+            final Date validFrom, final Date expiry, final BigDecimal balance,
+            final Currency balanceType, final String cardId, final String barcodeId,
+            final CatimaBarcode barcodeType, final Integer headerColor, final int starStatus,
+            final Long lastUsed, final int archiveStatus) {
         database.beginTransaction();
 
         // Card
@@ -401,6 +410,7 @@ public class DBHelper extends SQLiteOpenHelper {
         contentValues.put(LoyaltyCardDbIds.ID, id);
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
+        contentValues.put(LoyaltyCardDbIds.VALID_FROM, validFrom != null ? validFrom.getTime() : null);
         contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
         contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
         contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
@@ -424,15 +434,17 @@ public class DBHelper extends SQLiteOpenHelper {
 
     public static boolean updateLoyaltyCard(
             SQLiteDatabase database, final int id, final String store, final String note,
-            final Date expiry, final BigDecimal balance, final Currency balanceType,
-            final String cardId, final String barcodeId, final CatimaBarcode barcodeType,
-            final Integer headerColor, final int starStatus, final Long lastUsed, final int archiveStatus) {
+            final Date validFrom, final Date expiry, final BigDecimal balance,
+            final Currency balanceType, final String cardId, final String barcodeId,
+            final CatimaBarcode barcodeType, final Integer headerColor, final int starStatus,
+            final Long lastUsed, final int archiveStatus) {
         database.beginTransaction();
 
         // Card
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
+        contentValues.put(LoyaltyCardDbIds.VALID_FROM, validFrom != null ? validFrom.getTime() : null);
         contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
         contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
         contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);

app/src/main/java/protect/card_locker/GroupCursorAdapter.java

@@ -7,6 +7,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
@@ -17,7 +18,6 @@ import protect.card_locker.databinding.GroupLayoutBinding;
 import protect.card_locker.preferences.Settings;
 
 public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListItemViewHolder> {
-    Settings mSettings;
     public final Context mContext;
     private final GroupAdapterListener mListener;
     SQLiteDatabase mDatabase;
@@ -25,7 +25,6 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
     public GroupCursorAdapter(Context inputContext, Cursor inputCursor, GroupAdapterListener inputListener) {
         super(inputCursor, DBHelper.LoyaltyCardDbGroups.ORDER);
         setHasStableIds(true);
-        mSettings = new Settings(inputContext);
         mContext = inputContext;
         mListener = inputListener;
         mDatabase = new DBHelper(inputContext).getReadableDatabase();
@@ -63,8 +62,6 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
         }
 
         inputHolder.mCardCount.setText(cardCountText);
-        inputHolder.mName.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
-        inputHolder.mCardCount.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
 
         applyClickEvents(inputHolder);
     }
@@ -88,7 +85,7 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
 
     public static class GroupListItemViewHolder extends RecyclerView.ViewHolder {
         public TextView mName, mCardCount;
-        public ImageButton mMoveUp, mMoveDown, mEdit, mDelete;
+        public Button mMoveUp, mMoveDown, mEdit, mDelete;
 
         public GroupListItemViewHolder(GroupLayoutBinding groupLayoutBinding) {
             super(groupLayoutBinding.getRoot());

app/src/main/java/protect/card_locker/ImportExportActivity.java

@@ -43,8 +43,6 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
     private ImportExportActivityBinding binding;
     private static final String TAG = "Catima";
 
-    private static final int PERMISSIONS_EXTERNAL_STORAGE = 1;
-
     private ImportExportTask importExporter;
 
     private String importAlertTitle;
@@ -68,19 +66,6 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
         setSupportActionBar(toolbar);
         enableToolbarBackButton();
 
-        // If the application does not have permissions to external
-        // storage, ask for it now
-
-        if (ContextCompat.checkSelfPermission(ImportExportActivity.this,
-                Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED ||
-                ContextCompat.checkSelfPermission(ImportExportActivity.this,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(ImportExportActivity.this,
-                    new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
-                            Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                    PERMISSIONS_EXTERNAL_STORAGE);
-        }
-
         Intent fileIntent = getIntent();
         if (fileIntent != null && fileIntent.getType() != null) {
             chooseImportType(false, fileIntent.getData());
@@ -312,30 +297,6 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
         mTasks.executeTask(TaskHandler.TYPE.EXPORT, importExporter);
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-
-        if (requestCode == PERMISSIONS_EXTERNAL_STORAGE) {
-            // If request is cancelled, the result arrays are empty.
-            boolean success = grantResults.length > 0;
-
-            for (int grant : grantResults) {
-                if (grant != PackageManager.PERMISSION_GRANTED) {
-                    success = false;
-                }
-            }
-
-            if (!success) {
-                // External storage permission rejected, inform user that
-                // import/export is prevented
-                Toast.makeText(getApplicationContext(), R.string.noExternalStoragePermissionError,
-                        Toast.LENGTH_LONG).show();
-            }
-
-        }
-    }
-
     @Override
     protected void onDestroy() {
         mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false);

app/src/main/java/protect/card_locker/ImportURIHelper.java

@@ -18,6 +18,7 @@ import java.util.List;
 public class ImportURIHelper {
     private static final String STORE = DBHelper.LoyaltyCardDbIds.STORE;
     private static final String NOTE = DBHelper.LoyaltyCardDbIds.NOTE;
+    private static final String VALID_FROM = DBHelper.LoyaltyCardDbIds.VALID_FROM;
     private static final String EXPIRY = DBHelper.LoyaltyCardDbIds.EXPIRY;
     private static final String BALANCE = DBHelper.LoyaltyCardDbIds.BALANCE;
     private static final String BALANCE_TYPE = DBHelper.LoyaltyCardDbIds.BALANCE_TYPE;
@@ -62,6 +63,7 @@ public class ImportURIHelper {
         try {
             // These values are allowed to be null
             CatimaBarcode barcodeType = null;
+            Date validFrom = null;
             Date expiry = null;
             BigDecimal balance = new BigDecimal("0");
             Currency balanceType = null;
@@ -106,6 +108,10 @@ public class ImportURIHelper {
             if (unparsedBalanceType != null && !unparsedBalanceType.equals("")) {
                 balanceType = Currency.getInstance(unparsedBalanceType);
             }
+            String unparsedValidFrom = kv.get(VALID_FROM);
+            if (unparsedValidFrom != null && !unparsedValidFrom.equals("")) {
+                validFrom = new Date(Long.parseLong(unparsedValidFrom));
+            }
             String unparsedExpiry = kv.get(EXPIRY);
             if (unparsedExpiry != null && !unparsedExpiry.equals("")) {
                 expiry = new Date(Long.parseLong(unparsedExpiry));
@@ -116,8 +122,8 @@ public class ImportURIHelper {
                 headerColor = Integer.parseInt(unparsedHeaderColor);
             }
 
-            return new LoyaltyCard(-1, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0, Utils.getUnixTime(), 100,0);
-        } catch (NullPointerException | NumberFormatException | UnsupportedEncodingException ex) {
+            return new LoyaltyCard(-1, store, note, validFrom, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0, Utils.getUnixTime(), 100, 0);
+        } catch (NumberFormatException | UnsupportedEncodingException | ArrayIndexOutOfBoundsException ex) {
             throw new InvalidObjectException("Not a valid import URI");
         }
     }
@@ -149,6 +155,9 @@ public class ImportURIHelper {
         if (loyaltyCard.balanceType != null) {
             fragment = appendFragment(fragment, BALANCE_TYPE, loyaltyCard.balanceType.getCurrencyCode());
         }
+        if (loyaltyCard.validFrom != null) {
+            fragment = appendFragment(fragment, VALID_FROM, String.valueOf(loyaltyCard.validFrom.getTime()));
+        }
         if (loyaltyCard.expiry != null) {
             fragment = appendFragment(fragment, EXPIRY, String.valueOf(loyaltyCard.expiry.getTime()));
         }

app/src/main/java/protect/card_locker/LoyaltyCard.java

@@ -14,6 +14,7 @@ public class LoyaltyCard implements Parcelable {
     public final int id;
     public final String store;
     public final String note;
+    public final Date validFrom;
     public final Date expiry;
     public final BigDecimal balance;
     public final Currency balanceType;
@@ -33,14 +34,16 @@ public class LoyaltyCard implements Parcelable {
     public final long lastUsed;
     public int zoomLevel;
 
-    public LoyaltyCard(final int id, final String store, final String note, final Date expiry,
-                       final BigDecimal balance, final Currency balanceType, final String cardId,
-                       @Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType,
+    public LoyaltyCard(final int id, final String store, final String note, final Date validFrom,
+                       final Date expiry, final BigDecimal balance, final Currency balanceType,
+                       final String cardId, @Nullable final String barcodeId,
+                       @Nullable final CatimaBarcode barcodeType,
                        @Nullable final Integer headerColor, final int starStatus,
                        final long lastUsed, final int zoomLevel, final int archiveStatus) {
         this.id = id;
         this.store = store;
         this.note = note;
+        this.validFrom = validFrom;
         this.expiry = expiry;
         this.balance = balance;
         this.balanceType = balanceType;
@@ -58,6 +61,8 @@ public class LoyaltyCard implements Parcelable {
         id = in.readInt();
         store = in.readString();
         note = in.readString();
+        long tmpValidFrom = in.readLong();
+        validFrom = tmpValidFrom != -1 ? new Date(tmpValidFrom) : null;
         long tmpExpiry = in.readLong();
         expiry = tmpExpiry != -1 ? new Date(tmpExpiry) : null;
         balance = (BigDecimal) in.readValue(BigDecimal.class.getClassLoader());
@@ -79,6 +84,7 @@ public class LoyaltyCard implements Parcelable {
         parcel.writeInt(id);
         parcel.writeString(store);
         parcel.writeString(note);
+        parcel.writeLong(validFrom != null ? validFrom.getTime() : -1);
         parcel.writeLong(expiry != null ? expiry.getTime() : -1);
         parcel.writeValue(balance);
         parcel.writeValue(balanceType);
@@ -96,6 +102,7 @@ public class LoyaltyCard implements Parcelable {
         int id = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
         String store = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE));
         String note = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE));
+        long validFromLong = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.VALID_FROM));
         long expiryLong = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.EXPIRY));
         BigDecimal balance = new BigDecimal(cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE)));
         String cardId = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID));
@@ -111,6 +118,7 @@ public class LoyaltyCard implements Parcelable {
 
         CatimaBarcode barcodeType = null;
         Currency balanceType = null;
+        Date validFrom = null;
         Date expiry = null;
         Integer headerColor = null;
 
@@ -122,6 +130,10 @@ public class LoyaltyCard implements Parcelable {
             balanceType = Currency.getInstance(cursor.getString(balanceTypeColumn));
         }
 
+        if (validFromLong > 0) {
+            validFrom = new Date(validFromLong);
+        }
+
         if (expiryLong > 0) {
             expiry = new Date(expiryLong);
         }
@@ -130,7 +142,7 @@ public class LoyaltyCard implements Parcelable {
             headerColor = cursor.getInt(headerColorColumn);
         }
 
-        return new LoyaltyCard(id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred, lastUsed, zoomLevel,archived);
+        return new LoyaltyCard(id, store, note, validFrom, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred, lastUsed, zoomLevel, archived);
     }
 
     @Override

app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java

@@ -35,7 +35,6 @@ import protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder> {
     private int mCurrentSelectedIndex = -1;
-    Settings mSettings;
     boolean mDarkModeEnabled;
     public final Context mContext;
     private final CardAdapterListener mListener;
@@ -47,7 +46,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
     public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener) {
         super(inputCursor, DBHelper.LoyaltyCardDbIds.ID);
         setHasStableIds(true);
-        mSettings = new Settings(inputContext);
         mContext = inputContext;
         mListener = inputListener;
         mSelectedItems = new SparseBooleanArray();
@@ -107,7 +105,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
 
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
 
-        inputHolder.setStoreField(loyaltyCard.store);
         if (mShowDetails && !loyaltyCard.note.isEmpty()) {
             inputHolder.setNoteField(loyaltyCard.note);
         } else {
@@ -120,22 +117,21 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             inputHolder.setExtraField(inputHolder.mBalanceField, null, null);
         }
 
+        if (mShowDetails && loyaltyCard.validFrom != null) {
+            inputHolder.setExtraField(inputHolder.mValidFromField, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.validFrom), Utils.isNotYetValid(loyaltyCard.validFrom) ? Color.RED : null);
+        } else {
+            inputHolder.setExtraField(inputHolder.mValidFromField, null, null);
+        }
+
         if (mShowDetails && loyaltyCard.expiry != null) {
             inputHolder.setExtraField(inputHolder.mExpiryField, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry), Utils.hasExpired(loyaltyCard.expiry) ? Color.RED : null);
         } else {
             inputHolder.setExtraField(inputHolder.mExpiryField, null, null);
         }
 
-        setHeaderHeight(inputHolder, mShowDetails);
-        Bitmap cardIcon = Utils.retrieveCardImage(mContext, loyaltyCard.id, ImageLocationType.icon);
-        if (cardIcon != null) {
-            inputHolder.mCardIcon.setImageBitmap(cardIcon);
-            inputHolder.mCardIcon.setScaleType(ImageView.ScaleType.CENTER_CROP);
-        } else {
-            inputHolder.mCardIcon.setImageBitmap(Utils.generateIcon(mContext, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
-            inputHolder.mCardIcon.setScaleType(ImageView.ScaleType.FIT_CENTER);
-        }
-        inputHolder.setIconBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : R.attr.colorPrimary);
+        inputHolder.mCardIcon.setContentDescription(loyaltyCard.store);
+        Utils.setIconOrTextWithBackground(mContext, loyaltyCard, inputHolder.mCardIcon, inputHolder.mCardText);
+        inputHolder.setIconBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : androidx.appcompat.R.attr.colorPrimary);
 
         inputHolder.toggleCardStateIcon(loyaltyCard.starStatus != 0, loyaltyCard.archiveStatus != 0, itemSelected(inputCursor.getPosition()));
 
@@ -147,19 +143,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         inputHolder.mRow.requestLayout();
     }
 
-    private void setHeaderHeight(LoyaltyCardListItemViewHolder inputHolder, boolean expanded) {
-        int iconHeight;
-        if (expanded) {
-            iconHeight = ViewGroup.LayoutParams.MATCH_PARENT;
-        } else {
-            iconHeight = (int) mContext.getResources().getDimension(R.dimen.cardThumbnailSize);
-        }
-
-        inputHolder.mIconLayout.getLayoutParams().height = expanded ? 0 : iconHeight;
-        inputHolder.mCardIcon.getLayoutParams().height = iconHeight;
-        inputHolder.mTickIcon.getLayoutParams().height = iconHeight;
-    }
-
     private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition) {
         inputHolder.mRow.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));
 
@@ -235,27 +218,25 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
 
     public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {
 
-        public TextView mStoreField, mNoteField, mBalanceField, mExpiryField;
+        public TextView mCardText, mNoteField, mBalanceField, mValidFromField, mExpiryField;
         public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon, mArchivedBackground;
-        public MaterialCardView mRow, mIconLayout;
+        public MaterialCardView mRow;
         public ConstraintLayout mStar, mArchived;
         public View mDivider;
 
         private int mIconBackgroundColor;
 
-
-
         protected LoyaltyCardListItemViewHolder(LoyaltyCardLayoutBinding loyaltyCardLayoutBinding, CardAdapterListener inputListener) {
             super(loyaltyCardLayoutBinding.getRoot());
             View inputView = loyaltyCardLayoutBinding.getRoot();
             mRow = loyaltyCardLayoutBinding.row;
             mDivider = loyaltyCardLayoutBinding.infoDivider;
-            mStoreField = loyaltyCardLayoutBinding.store;
             mNoteField = loyaltyCardLayoutBinding.note;
             mBalanceField = loyaltyCardLayoutBinding.balance;
+            mValidFromField = loyaltyCardLayoutBinding.validFrom;
             mExpiryField = loyaltyCardLayoutBinding.expiry;
-            mIconLayout = loyaltyCardLayoutBinding.iconLayout;
             mCardIcon = loyaltyCardLayoutBinding.thumbnail;
+            mCardText = loyaltyCardLayoutBinding.thumbnailText;
             mStar = loyaltyCardLayoutBinding.star;
             mStarBackground = loyaltyCardLayoutBinding.starBackground;
             mStarBorder = loyaltyCardLayoutBinding.starBorder;
@@ -278,20 +259,15 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
                 return;
             }
 
-            int size = mSettings.getFontSizeMax(mSettings.getSmallFont());
-
             field.setVisibility(View.VISIBLE);
             field.setText(text);
-            field.setTextSize(size);
-            field.setTextColor(color != null ? color : MaterialColors.getColor(mContext, R.attr.colorSecondary, ContextCompat.getColor(mContext, mDarkModeEnabled ? R.color.md_theme_dark_secondary : R.color.md_theme_light_secondary)));
+            field.setTextColor(color != null ? color : MaterialColors.getColor(mContext, com.google.android.material.R.attr.colorSecondary, ContextCompat.getColor(mContext, mDarkModeEnabled ? R.color.md_theme_dark_secondary : R.color.md_theme_light_secondary)));
 
-            int drawableSize = dpToPx((size * 24) / 14, mContext);
             mDivider.setVisibility(View.VISIBLE);
             field.setVisibility(View.VISIBLE);
             Drawable icon = field.getCompoundDrawables()[0];
             if (icon != null) {
                 icon.mutate();
-                icon.setBounds(0, 0, drawableSize, drawableSize);
                 field.setCompoundDrawablesRelative(icon, null, null, null);
 
                 if (color != null) {
@@ -304,19 +280,12 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             field.requestLayout();
         }
 
-        public void setStoreField(String text) {
-            mStoreField.setText(text);
-            mStoreField.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
-            mStoreField.requestLayout();
-        }
-
         public void setNoteField(String text) {
             if (text == null) {
                 mNoteField.setVisibility(View.GONE);
             } else {
                 mNoteField.setVisibility(View.VISIBLE);
                 mNoteField.setText(text);
-                mNoteField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
             }
             mNoteField.requestLayout();
         }

app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java

@@ -1,6 +1,5 @@
 package protect.card_locker;
 
-import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.DatePickerDialog;
@@ -24,6 +23,7 @@ import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 import android.widget.ArrayAdapter;
@@ -31,6 +31,7 @@ import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.EditText;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -71,7 +72,8 @@ import java.util.concurrent.Callable;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.Toolbar;
@@ -83,7 +85,7 @@ import protect.card_locker.async.TaskHandler;
 import protect.card_locker.databinding.LayoutChipChoiceBinding;
 import protect.card_locker.databinding.LoyaltyCardEditActivityBinding;
 
-public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
+public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements BarcodeImageWriterResultCallback {
     private LoyaltyCardEditActivityBinding binding;
     private static final String TAG = "Catima";
 
@@ -98,6 +100,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     private final String STATE_FRONT_IMAGE_REMOVED = "frontImageRemoved";
     private final String STATE_BACK_IMAGE_REMOVED = "backImageRemoved";
     private final String STATE_ICON_REMOVED = "iconRemoved";
+    private final String STATE_OPEN_SET_ICON_MENU = "openSetIconMenu";
 
     private final String TEMP_CAMERA_IMAGE_NAME = LoyaltyCardEditActivity.class.getSimpleName() + "_camera_image.jpg";
     private final String TEMP_CROP_IMAGE_NAME = LoyaltyCardEditActivity.class.getSimpleName() + "_crop_image.png";
@@ -111,10 +114,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     private static final int PERMISSION_REQUEST_CAMERA_IMAGE_FRONT = 100;
     private static final int PERMISSION_REQUEST_CAMERA_IMAGE_BACK = 101;
     private static final int PERMISSION_REQUEST_CAMERA_IMAGE_ICON = 102;
+    private static final int PERMISSION_REQUEST_STORAGE_IMAGE_FRONT = 103;
+    private static final int PERMISSION_REQUEST_STORAGE_IMAGE_BACK = 104;
+    private static final int PERMISSION_REQUEST_STORAGE_IMAGE_ICON = 105;
 
     public static final String BUNDLE_ID = "id";
     public static final String BUNDLE_DUPLICATE_ID = "duplicateId";
     public static final String BUNDLE_UPDATE = "update";
+    public static final String BUNDLE_OPEN_SET_ICON_MENU = "openSetIconMenu";
     public static final String BUNDLE_CARDID = "cardId";
     public static final String BUNDLE_BARCODEID = "barcodeId";
     public static final String BUNDLE_BARCODETYPE = "barcodeType";
@@ -127,6 +134,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     EditText storeFieldEdit;
     EditText noteFieldEdit;
     ChipGroup groupsChips;
+    AutoCompleteTextView validFromField;
     AutoCompleteTextView expiryField;
     EditText balanceField;
     AutoCompleteTextView balanceCurrencyField;
@@ -148,6 +156,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     int loyaltyCardId;
     boolean updateLoyaltyCard;
     boolean duplicateFromLoyaltyCardId;
+    boolean openSetIconMenu;
     String cardId;
     String barcodeId;
     String barcodeType;
@@ -165,8 +174,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     AlertDialog confirmExitDialog = null;
 
     boolean validBalance = true;
-    Runnable barcodeImageGenerationFinishedCallback;
-
     HashMap<String, Currency> currencies = new HashMap<>();
 
     LoyaltyCard tempLoyaltyCard;
@@ -205,6 +212,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                 (int) (fieldName == LoyaltyCardField.id ? value : loyaltyCard.id),
                 (String) (fieldName == LoyaltyCardField.store ? value : loyaltyCard.store),
                 (String) (fieldName == LoyaltyCardField.note ? value : loyaltyCard.note),
+                (Date) (fieldName == LoyaltyCardField.validFrom ? value : loyaltyCard.validFrom),
                 (Date) (fieldName == LoyaltyCardField.expiry ? value : loyaltyCard.expiry),
                 (BigDecimal) (fieldName == LoyaltyCardField.balance ? value : loyaltyCard.balance),
                 (Currency) (fieldName == LoyaltyCardField.balanceType ? value : loyaltyCard.balanceType),
@@ -235,6 +243,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         updateLoyaltyCard = b != null && b.getBoolean(BUNDLE_UPDATE, false);
         duplicateFromLoyaltyCardId = b != null && b.getBoolean(BUNDLE_DUPLICATE_ID, false);
 
+        openSetIconMenu = b != null && b.getBoolean(BUNDLE_OPEN_SET_ICON_MENU, false);
+
         cardId = b != null ? b.getString(BUNDLE_CARDID) : null;
         barcodeId = b != null ? b.getString(BUNDLE_BARCODEID) : null;
         barcodeType = b != null ? b.getString(BUNDLE_BARCODETYPE) : null;
@@ -281,6 +291,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         savedInstanceState.putInt(STATE_FRONT_IMAGE_REMOVED, mFrontImageRemoved ? 1 : 0);
         savedInstanceState.putInt(STATE_BACK_IMAGE_REMOVED, mBackImageRemoved ? 1 : 0);
         savedInstanceState.putInt(STATE_ICON_REMOVED, mIconRemoved ? 1 : 0);
+        savedInstanceState.putInt(STATE_OPEN_SET_ICON_MENU, openSetIconMenu ? 1 : 0);
     }
 
     @Override
@@ -298,6 +309,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         mFrontImageRemoved = savedInstanceState.getInt(STATE_FRONT_IMAGE_REMOVED) == 1;
         mBackImageRemoved = savedInstanceState.getInt(STATE_BACK_IMAGE_REMOVED) == 1;
         mIconRemoved = savedInstanceState.getInt(STATE_ICON_REMOVED) == 1;
+        openSetIconMenu = savedInstanceState.getInt(STATE_OPEN_SET_ICON_MENU) == 1;
     }
 
     @Override
@@ -325,6 +337,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         storeFieldEdit = binding.storeNameEdit;
         noteFieldEdit = binding.noteEdit;
         groupsChips = binding.groupChips;
+        validFromField = binding.validFromField;
         expiryField = binding.expiryField;
         balanceField = binding.balanceField;
         balanceCurrencyField = binding.balanceCurrencyField;
@@ -342,13 +355,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
         enterButton = binding.enterButton;
 
-        barcodeImageGenerationFinishedCallback = () -> {
-            if (!(boolean) barcodeImage.getTag()) {
-                barcodeImageLayout.setVisibility(View.GONE);
-                Toast.makeText(LoyaltyCardEditActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
-            }
-        };
-
         storeFieldEdit.addTextChangedListener(new SimpleTextWatcher() {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
@@ -364,38 +370,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             }
         });
 
-        expiryField.addTextChangedListener(new SimpleTextWatcher() {
-            CharSequence lastValue;
+        addDateFieldTextChangedListener(validFromField, R.string.anyDate, R.string.chooseValidFromDate, LoyaltyCardField.validFrom);
 
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                lastValue = s;
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (s.toString().equals(getString(R.string.never))) {
-                    expiryField.setTag(null);
-                } else if (s.toString().equals(getString(R.string.chooseExpiryDate))) {
-                    if (!lastValue.toString().equals(getString(R.string.chooseExpiryDate))) {
-                        expiryField.setText(lastValue);
-                    }
-                    DialogFragment datePickerFragment = new DatePickerFragment(LoyaltyCardEditActivity.this, expiryField);
-                    datePickerFragment.show(getSupportFragmentManager(), "datePicker");
-                }
-
-                updateTempState(LoyaltyCardField.expiry, expiryField.getTag());
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                ArrayList<String> expiryList = new ArrayList<>();
-                expiryList.add(0, getString(R.string.never));
-                expiryList.add(1, getString(R.string.chooseExpiryDate));
-                ArrayAdapter<String> expiryAdapter = new ArrayAdapter<>(LoyaltyCardEditActivity.this, android.R.layout.select_dialog_item, expiryList);
-                expiryField.setAdapter(expiryAdapter);
-            }
-        });
+        addDateFieldTextChangedListener(expiryField, R.string.never, R.string.chooseExpiryDate, LoyaltyCardField.expiry);
 
         balanceField.setOnFocusChangeListener((v, hasFocus) -> {
             if (!hasFocus) {
@@ -516,10 +493,19 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                     builder.setTitle(R.string.setBarcodeId);
                     final EditText input = new EditText(LoyaltyCardEditActivity.this);
                     input.setInputType(InputType.TYPE_CLASS_TEXT);
+
+                    FrameLayout container = new FrameLayout(LoyaltyCardEditActivity.this);
+                    FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+                    int contentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
+                    params.leftMargin = contentPadding;
+                    params.rightMargin = contentPadding;
+
+                    input.setLayoutParams(params);
+                    container.addView(input);
                     if (tempLoyaltyCard.barcodeId != null) {
                         input.setText(tempLoyaltyCard.barcodeId);
                     }
-                    builder.setView(input);
+                    builder.setView(container);
 
                     builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
                         // If the user manually changes the barcode again make sure we disable the
@@ -693,16 +679,16 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         }
         mCropperOptions.setAspectRatioOptions(selectedByDefault,
                 new AspectRatio(null, 1, 1),
-                new AspectRatio(getResources().getString(R.string.ucrop_label_original).toUpperCase(), sourceWidth, sourceHeight),
+                new AspectRatio(getResources().getString(com.yalantis.ucrop.R.string.ucrop_label_original).toUpperCase(), sourceWidth, sourceHeight),
                 new AspectRatio(getResources().getString(R.string.card).toUpperCase(), 85.6f, 53.98f)
         );
 
         // Fix theming
 
-        int colorPrimary = MaterialColors.getColor(this, R.attr.colorPrimary, ContextCompat.getColor(this, R.color.md_theme_light_primary));
-        int colorOnPrimary = MaterialColors.getColor(this, R.attr.colorOnPrimary, ContextCompat.getColor(this, R.color.md_theme_light_onPrimary));
-        int colorSurface = MaterialColors.getColor(this, R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
-        int colorOnSurface = MaterialColors.getColor(this, R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
+        int colorPrimary = MaterialColors.getColor(this, androidx.appcompat.R.attr.colorPrimary, ContextCompat.getColor(this, R.color.md_theme_light_primary));
+        int colorOnPrimary = MaterialColors.getColor(this, com.google.android.material.R.attr.colorOnPrimary, ContextCompat.getColor(this, R.color.md_theme_light_onPrimary));
+        int colorSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
+        int colorOnSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
         int colorBackground = MaterialColors.getColor(this, android.R.attr.colorBackground, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
         mCropperOptions.setToolbarColor(colorSurface);
         mCropperOptions.setStatusBarColor(colorSurface);
@@ -776,7 +762,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                 }
             } else {
                 // New card, use default values
-                tempLoyaltyCard = new LoyaltyCard(-1, "", "", null, new BigDecimal("0"), null, "", null, null, null, 0, Utils.getUnixTime(), 100,0);
+                tempLoyaltyCard = new LoyaltyCard(-1, "", "", null, null, new BigDecimal("0"), null, "", null, null, null, 0, Utils.getUnixTime(), 100,0);
 
             }
         }
@@ -819,7 +805,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
         storeFieldEdit.setText(tempLoyaltyCard.store);
         noteFieldEdit.setText(tempLoyaltyCard.note);
-        formatExpiryField(this, expiryField, tempLoyaltyCard.expiry);
+        formatDateField(this, validFromField, tempLoyaltyCard.validFrom);
+        formatDateField(this, expiryField, tempLoyaltyCard.expiry);
         formatBalanceCurrencyField(tempLoyaltyCard.balanceType);
         cardIdFieldView.setText(tempLoyaltyCard.cardId);
         barcodeIdField.setText(tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : getString(R.string.sameAsCardId));
@@ -928,12 +915,19 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         }
 
         onResuming = false;
+
+        // Fake click on the edit icon to cause the set icon option to pop up if the icon was
+        // long-pressed in the view activity
+        if (openSetIconMenu) {
+            openSetIconMenu = false;
+            thumbnail.callOnClick();
+        }
     }
 
     protected void setColorFromIcon() {
         Object icon = thumbnail.getTag();
         if (icon != null && (icon instanceof Bitmap)) {
-            int headerColor = Utils.getHeaderColorFromImage((Bitmap) icon, tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : R.attr.colorPrimary);
+            int headerColor = Utils.getHeaderColorFromImage((Bitmap) icon, tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : androidx.appcompat.R.attr.colorPrimary);
 
             updateTempState(LoyaltyCardField.headerColor, headerColor);
 
@@ -954,13 +948,62 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         }
     }
 
-    protected static void formatExpiryField(Context context, EditText expiryField, Date expiry) {
-        expiryField.setTag(expiry);
+    protected void addDateFieldTextChangedListener(AutoCompleteTextView dateField, @StringRes int defaultOptionStringId, @StringRes int chooseDateOptionStringId, LoyaltyCardField loyaltyCardField) {
+        dateField.addTextChangedListener(new SimpleTextWatcher() {
+            CharSequence lastValue;
 
-        if (expiry == null) {
-            expiryField.setText(context.getString(R.string.never));
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                lastValue = s;
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (s.toString().equals(getString(defaultOptionStringId))) {
+                    dateField.setTag(null);
+                } else if (s.toString().equals(getString(chooseDateOptionStringId))) {
+                    if (!lastValue.toString().equals(getString(chooseDateOptionStringId))) {
+                        dateField.setText(lastValue);
+                    }
+                    DialogFragment datePickerFragment = new DatePickerFragment(
+                            LoyaltyCardEditActivity.this,
+                            dateField,
+                            // if the expiry date is being set, set date picker's minDate to the 'valid from' date
+                            loyaltyCardField == LoyaltyCardField.expiry ? (Date) validFromField.getTag() : null,
+                            // if the 'valid from' date is being set, set date picker's maxDate to the expiry date
+                            loyaltyCardField == LoyaltyCardField.validFrom ? (Date) expiryField.getTag() : null);
+                    datePickerFragment.show(getSupportFragmentManager(), "datePicker");
+                }
+
+                updateTempState(loyaltyCardField, dateField.getTag());
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                ArrayList<String> dropdownOptions = new ArrayList<>();
+                dropdownOptions.add(0, getString(defaultOptionStringId));
+                dropdownOptions.add(1, getString(chooseDateOptionStringId));
+                ArrayAdapter<String> dropdownOptionsAdapter = new ArrayAdapter<>(LoyaltyCardEditActivity.this, android.R.layout.select_dialog_item, dropdownOptions);
+                dateField.setAdapter(dropdownOptionsAdapter);
+            }
+        });
+    }
+
+    protected static void formatDateField(Context context, EditText textField, Date date) {
+        textField.setTag(date);
+
+        if (date == null) {
+            String text;
+            if (textField.getId() == R.id.validFromField) {
+                text = context.getString(R.string.anyDate);
+            } else if (textField.getId() == R.id.expiryField) {
+                text = context.getString(R.string.never);
+            } else {
+                throw new IllegalArgumentException("Unknown textField Id " + textField.getId());
+            }
+            textField.setText(text);
         } else {
-            expiryField.setText(DateFormat.getDateInstance(DateFormat.LONG).format(expiry));
+            textField.setText(DateFormat.getDateInstance(DateFormat.LONG).format(date));
         }
     }
 
@@ -981,14 +1024,59 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
 
-        if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-            if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_FRONT) {
+        onMockedRequestPermissionsResult(requestCode, permissions, grantResults);
+    }
+
+    public void onMockedRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        boolean granted = grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED;
+        Integer failureReason = null;
+
+        if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_FRONT) {
+            if (granted) {
                 takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_FRONT);
-            } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_BACK) {
-                takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_BACK);
-            } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_ICON) {
-                takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_ICON);
+                return;
             }
+
+            failureReason = R.string.cameraPermissionRequired;
+        } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_BACK) {
+            if (granted) {
+                takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_BACK);
+                return;
+            }
+
+            failureReason = R.string.cameraPermissionRequired;
+        } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_ICON) {
+            if (granted) {
+                takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_ICON);
+                return;
+            }
+
+            failureReason = R.string.cameraPermissionRequired;
+        } else if (requestCode == PERMISSION_REQUEST_STORAGE_IMAGE_FRONT) {
+            if (granted) {
+                selectImageFromGallery(Utils.CARD_IMAGE_FROM_FILE_FRONT);
+                return;
+            }
+
+            failureReason = R.string.storageReadPermissionRequired;
+        } else if (requestCode == PERMISSION_REQUEST_STORAGE_IMAGE_BACK) {
+            if (granted) {
+                selectImageFromGallery(Utils.CARD_IMAGE_FROM_FILE_BACK);
+                return;
+            }
+
+            failureReason = R.string.storageReadPermissionRequired;
+        } else if (requestCode == PERMISSION_REQUEST_STORAGE_IMAGE_ICON) {
+            if (granted) {
+                selectImageFromGallery(Utils.CARD_IMAGE_FROM_FILE_ICON);
+                return;
+            }
+
+            failureReason = R.string.storageReadPermissionRequired;
+        }
+
+        if (failureReason != null) {
+            Toast.makeText(this, failureReason, Toast.LENGTH_LONG).show();
         }
     }
 
@@ -1057,7 +1145,38 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         Uri photoURI = FileProvider.getUriForFile(LoyaltyCardEditActivity.this, BuildConfig.APPLICATION_ID, Utils.createTempFile(this, TEMP_CAMERA_IMAGE_NAME));
         mRequestedImage = type;
 
-        mPhotoTakerLauncher.launch(photoURI);
+        try {
+            mPhotoTakerLauncher.launch(photoURI);
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(getApplicationContext(), R.string.cameraPermissionDeniedTitle, Toast.LENGTH_LONG).show();
+            Log.e(TAG, "No activity found to handle intent", e);
+        }
+    }
+
+    private void selectImageFromGallery(int type) {
+        mRequestedImage = type;
+
+        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
+        photoPickerIntent.setType("image/*");
+        Intent contentIntent = new Intent(Intent.ACTION_GET_CONTENT);
+        contentIntent.setType("image/*");
+        Intent chooserIntent = Intent.createChooser(photoPickerIntent, getString(R.string.addFromImage));
+        chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] { contentIntent });
+
+        try {
+            mPhotoPickerLauncher.launch(chooserIntent);
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(getApplicationContext(), R.string.failedLaunchingPhotoPicker, Toast.LENGTH_LONG).show();
+            Log.e(TAG, "No activity found to handle intent", e);
+        }
+    }
+
+    @Override
+    public void onBarcodeImageWriterResult(boolean success) {
+        if (!success) {
+            barcodeImageLayout.setVisibility(View.GONE);
+            Toast.makeText(LoyaltyCardEditActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
+        }
     }
 
     class EditCardIdAndBarcode implements View.OnClickListener {
@@ -1141,59 +1260,38 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             }
 
             cardOptions.put(getString(R.string.takePhoto), () -> {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    int permissionRequestType;
+                int permissionRequestType;
 
-                    if (v.getId() == R.id.frontImageHolder) {
-                        permissionRequestType = PERMISSION_REQUEST_CAMERA_IMAGE_FRONT;
-                    } else if (v.getId() == R.id.backImageHolder) {
-                        permissionRequestType = PERMISSION_REQUEST_CAMERA_IMAGE_BACK;
-                    } else if (v.getId() == R.id.thumbnail) {
-                        permissionRequestType = PERMISSION_REQUEST_CAMERA_IMAGE_ICON;
-                    } else {
-                        throw new IllegalArgumentException("Unknown ID type " + v.getId());
-                    }
-
-                    requestPermissions(new String[]{Manifest.permission.CAMERA}, permissionRequestType);
-                } else {
-                    int cardImageType;
-
-                    if (v.getId() == R.id.frontImageHolder) {
-                        cardImageType = Utils.CARD_IMAGE_FROM_CAMERA_FRONT;
-                    } else if (v.getId() == R.id.backImageHolder) {
-                        cardImageType = Utils.CARD_IMAGE_FROM_CAMERA_BACK;
-                    } else if (v.getId() == R.id.thumbnail) {
-                        cardImageType = Utils.CARD_IMAGE_FROM_CAMERA_ICON;
-                    } else {
-                        throw new IllegalArgumentException("Unknown ID type " + v.getId());
-                    }
-
-                    takePhotoForCard(cardImageType);
-                }
-                return null;
-            });
-
-            cardOptions.put(getString(R.string.addFromImage), () -> {
                 if (v.getId() == R.id.frontImageHolder) {
-                    mRequestedImage = Utils.CARD_IMAGE_FROM_FILE_FRONT;
+                    permissionRequestType = PERMISSION_REQUEST_CAMERA_IMAGE_FRONT;
                 } else if (v.getId() == R.id.backImageHolder) {
-                    mRequestedImage = Utils.CARD_IMAGE_FROM_FILE_BACK;
+                    permissionRequestType = PERMISSION_REQUEST_CAMERA_IMAGE_BACK;
                 } else if (v.getId() == R.id.thumbnail) {
-                    mRequestedImage = Utils.CARD_IMAGE_FROM_FILE_ICON;
+                    permissionRequestType = PERMISSION_REQUEST_CAMERA_IMAGE_ICON;
                 } else {
                     throw new IllegalArgumentException("Unknown ID type " + v.getId());
                 }
 
-                Intent i = new Intent(Intent.ACTION_PICK);
-                i.setType("image/*");
+                PermissionUtils.requestCameraPermission(LoyaltyCardEditActivity.this, permissionRequestType);
 
-                try {
-                    mPhotoPickerLauncher.launch(i);
-                } catch (ActivityNotFoundException e) {
-                    Toast.makeText(getApplicationContext(), R.string.failedLaunchingPhotoPicker, Toast.LENGTH_LONG).show();
-                    Log.e(TAG, "No activity found to handle intent", e);
+                return null;
+            });
+
+            cardOptions.put(getString(R.string.addFromImage), () -> {
+                int permissionRequestType;
+
+                if (v.getId() == R.id.frontImageHolder) {
+                    permissionRequestType = PERMISSION_REQUEST_STORAGE_IMAGE_FRONT;
+                } else if (v.getId() == R.id.backImageHolder) {
+                    permissionRequestType = PERMISSION_REQUEST_STORAGE_IMAGE_BACK;
+                } else if (v.getId() == R.id.thumbnail) {
+                    permissionRequestType = PERMISSION_REQUEST_STORAGE_IMAGE_ICON;
+                } else {
+                    throw new IllegalArgumentException("Unknown ID type " + v.getId());
                 }
 
+                PermissionUtils.requestStorageReadPermission(LoyaltyCardEditActivity.this, permissionRequestType);
+
                 return null;
             });
 
@@ -1237,11 +1335,17 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             implements DatePickerDialog.OnDateSetListener {
 
         final Context context;
-        final EditText expiryFieldEdit;
+        final EditText textFieldEdit;
+        @Nullable
+        final Date minDate;
+        @Nullable
+        final Date maxDate;
 
-        DatePickerFragment(Context context, EditText expiryFieldEdit) {
+        DatePickerFragment(Context context, EditText textFieldEdit, @Nullable Date minDate, @Nullable Date maxDate) {
             this.context = context;
-            this.expiryFieldEdit = expiryFieldEdit;
+            this.textFieldEdit = textFieldEdit;
+            this.minDate = minDate;
+            this.maxDate = maxDate;
         }
 
         @NonNull
@@ -1250,7 +1354,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             // Use the current date as the default date in the picker
             final Calendar c = Calendar.getInstance();
 
-            Date date = (Date) expiryFieldEdit.getTag();
+            Date date = (Date) textFieldEdit.getTag();
             if (date != null) {
                 c.setTime(date);
             }
@@ -1261,17 +1365,23 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
             // Create a new instance of DatePickerDialog and return it
             DatePickerDialog datePickerDialog = new DatePickerDialog(getActivity(), this, year, month, day);
-            datePickerDialog.getDatePicker().setMinDate(getMinDateOfDatePicker());
+            datePickerDialog.getDatePicker().setMinDate(minDate != null ? minDate.getTime() : getDefaultMinDateOfDatePicker());
+            datePickerDialog.getDatePicker().setMaxDate(maxDate != null ? maxDate.getTime() : getDefaultMaxDateOfDatePicker());
             return datePickerDialog;
         }
 
-        private long getMinDateOfDatePicker()
-        {
+        private long getDefaultMinDateOfDatePicker() {
             Calendar minDateCalendar = Calendar.getInstance();
             minDateCalendar.set(1970, 0, 1);
             return minDateCalendar.getTimeInMillis();
         }
 
+        private long getDefaultMaxDateOfDatePicker() {
+            Calendar maxDateCalendar = Calendar.getInstance();
+            maxDateCalendar.set(2100, 11, 31);
+            return maxDateCalendar.getTimeInMillis();
+        }
+
         public void onDateSet(DatePicker view, int year, int month, int day) {
             Calendar c = new GregorianCalendar();
             c.set(Calendar.YEAR, year);
@@ -1286,7 +1396,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
             Date date = new Date(unixTime);
 
-            formatExpiryField(context, expiryFieldEdit, date);
+            formatDateField(context, textFieldEdit, date);
         }
     }
 
@@ -1327,9 +1437,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         // This makes the DBHelper set it to the current date
         // So that new and edited card are always on top when sorting by recently used
         if (updateLoyaltyCard) {
-            DBHelper.updateLoyaltyCard(mDatabase, loyaltyCardId, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor, tempLoyaltyCard.starStatus, null, tempLoyaltyCard.archiveStatus);
+            DBHelper.updateLoyaltyCard(mDatabase, loyaltyCardId, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.validFrom, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor, tempLoyaltyCard.starStatus, null, tempLoyaltyCard.archiveStatus);
         } else {
-            loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor, 0, null, 0);
+            loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.validFrom, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor, 0, null, 0);
         }
 
         try {
@@ -1466,13 +1576,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                             barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback, true);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, LoyaltyCardEditActivity.this, true);
                             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                         }
                     });
         } else {
             Log.d(TAG, "ImageView size known known, creating barcode");
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback, true);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, this, true);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }

app/src/main/java/protect/card_locker/LoyaltyCardField.java

@@ -4,6 +4,7 @@ public enum LoyaltyCardField {
     id,
     store,
     note,
+    validFrom,
     expiry,
     balance,
     balanceType,

app/src/main/java/protect/card_locker/MainActivity.java

@@ -50,7 +50,7 @@ import protect.card_locker.databinding.MainActivityBinding;
 import protect.card_locker.databinding.SortingOptionBinding;
 import protect.card_locker.preferences.SettingsActivity;
 
-public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener, GestureDetector.OnGestureListener {
+public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
     private MainActivityBinding binding;
     private ArchiveActivityBinding archiveActivityBinding;
     private ContentMainBinding contentMainBinding;
@@ -63,7 +63,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     private LoyaltyCardCursorAdapter mAdapter;
     private ActionMode mCurrentActionMode;
     private SearchView mSearchView;
-    private GestureDetector mGestureDetector;
     private int mLoyaltyCardCount = 0;
     protected String mFilter = "";
     protected Object mGroup = null;
@@ -282,19 +281,11 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             }
         });
 
-        mGestureDetector = new GestureDetector(this, this);
-
-        View.OnTouchListener gestureTouchListener = (v, event) -> mGestureDetector.onTouchEvent(event);
-
         mHelpSection = contentMainBinding.helpSection;
         mNoMatchingCardsText = contentMainBinding.noMatchingCardsText;
         mNoGroupCardsText = contentMainBinding.noGroupCardsText;
         mCardList = contentMainBinding.list;
 
-        mNoMatchingCardsText.setOnTouchListener(gestureTouchListener);
-        mCardList.setOnTouchListener(gestureTouchListener);
-        mNoGroupCardsText.setOnTouchListener(gestureTouchListener);
-
         mAdapter = new LoyaltyCardCursorAdapter(this, null, this);
         mCardList.setAdapter(mAdapter);
         registerForContextMenu(mCardList);
@@ -375,18 +366,28 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         // Start of active tab logic
         updateTabGroups(groupsTabLayout);
 
-        // Restore settings from Shared Preference
+        // Restore selected tab from Shared Preference
         SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
                 getString(R.string.sharedpreference_active_tab),
                 Context.MODE_PRIVATE);
         selectedTab = activeTabPref.getInt(getString(R.string.sharedpreference_active_tab), 0);
+
+        // Restore sort preferences from Shared Preferences
+        // If one of the sorting prefererences has never been set or is set to an invalid value,
+        // stick to the defaults.
         SharedPreferences sortPref = getApplicationContext().getSharedPreferences(
                 getString(R.string.sharedpreference_sort),
                 Context.MODE_PRIVATE);
-        try {
-            mOrder = DBHelper.LoyaltyCardOrder.valueOf(sortPref.getString(getString(R.string.sharedpreference_sort_order), null));
-            mOrderDirection = DBHelper.LoyaltyCardOrderDirection.valueOf(sortPref.getString(getString(R.string.sharedpreference_sort_direction), null));
-        } catch (IllegalArgumentException | NullPointerException ignored) {
+
+        String orderString = sortPref.getString(getString(R.string.sharedpreference_sort_order), null);
+        String orderDirectionString = sortPref.getString(getString(R.string.sharedpreference_sort_direction), null);
+
+        if (orderString != null && orderDirectionString != null) {
+            try {
+                mOrder = DBHelper.LoyaltyCardOrder.valueOf(orderString);
+                mOrderDirection = DBHelper.LoyaltyCardOrderDirection.valueOf(orderDirectionString);
+            } catch (IllegalArgumentException ignored) {
+            }
         }
 
         mGroup = null;
@@ -425,7 +426,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
     @Override
     public void onBackPressed() {
-        if (!mSearchView.isIconified()) {
+        if (mSearchView != null && !mSearchView.isIconified()) {
             mSearchView.setIconified(true);
             return;
         }
@@ -520,38 +521,41 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
         // Check if an image was shared to us
         if (Intent.ACTION_SEND.equals(receivedAction)) {
-            if (receivedType.startsWith("image/")) {
-                BarcodeValues barcodeValues;
-                try {
-                    Bitmap bitmap;
-                    try {
-                        Uri data = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-                        bitmap = Utils.retrieveImageFromUri(this, data);
-                    } catch (IOException e) {
-                        Log.e(TAG, "Error getting data from image file");
-                        e.printStackTrace();
-                        Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                        finish();
-                        return;
-                    }
-
-                    barcodeValues = Utils.getBarcodeFromBitmap(bitmap);
-
-                    if (barcodeValues.isEmpty()) {
-                        Log.i(TAG, "No barcode found in image file");
-                        Toast.makeText(this, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
-                        finish();
-                        return;
-                    }
-                } catch (NullPointerException e) {
-                    Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                    finish();
-                    return;
-                }
-                processBarcodeValues(barcodeValues, null);
-            } else {
+            if (!receivedType.startsWith("image/")) {
                 Log.e(TAG, "Wrong mime-type");
+                return;
             }
+
+            BarcodeValues barcodeValues;
+            Bitmap bitmap;
+
+            Uri data = intent.getParcelableExtra(Intent.EXTRA_STREAM);
+            if (data == null) {
+                Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+                finish();
+                return;
+            }
+
+            try {
+                bitmap = Utils.retrieveImageFromUri(this, data);
+            } catch (IOException e) {
+                Log.e(TAG, "Error getting data from image file");
+                e.printStackTrace();
+                Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+                finish();
+                return;
+            }
+
+            barcodeValues = Utils.getBarcodeFromBitmap(bitmap);
+
+            if (barcodeValues.isEmpty()) {
+                Log.i(TAG, "No barcode found in image file");
+                Toast.makeText(this, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
+                finish();
+                return;
+            }
+
+            processBarcodeValues(barcodeValues, null);
         }
     }
 
@@ -755,83 +759,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         updateLoyaltyCardList(false);
     }
 
-    @Override
-    public boolean onDown(MotionEvent e) {
-        return false;
-    }
-
-    @Override
-    public void onShowPress(MotionEvent e) {
-
-    }
-
-    @Override
-    public boolean onSingleTapUp(MotionEvent e) {
-        return false;
-    }
-
-    @Override
-    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-        return false;
-    }
-
-    @Override
-    public void onLongPress(MotionEvent e) {
-
-    }
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        mGestureDetector.onTouchEvent(ev);
-        return super.dispatchTouchEvent(ev);
-    }
-
-    @Override
-    public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-        Log.d(TAG, "On fling");
-
-        // Don't swipe if we have too much vertical movement
-        if (Math.abs(velocityY) > (0.75 * Math.abs(velocityX))) {
-            return false;
-        }
-
-        if (groupsTabLayout.getTabCount() < 2) {
-            return false;
-        }
-
-        Integer currentTab = groupsTabLayout.getSelectedTabPosition();
-        Log.d("onFling", "Current Tab " + currentTab);
-        // Swipe right
-        if (velocityX < -150) {
-            Log.d("onFling", "Right Swipe detected " + velocityX);
-            Integer nextTab = currentTab + 1;
-
-            if (nextTab == groupsTabLayout.getTabCount()) {
-                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(0));
-            } else {
-                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(nextTab));
-            }
-
-            return true;
-        }
-
-        // Swipe left
-        if (velocityX > 150) {
-            Log.d("onFling", "Left Swipe detected " + velocityX);
-            Integer nextTab = currentTab - 1;
-
-            if (nextTab < 0) {
-                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(groupsTabLayout.getTabCount() - 1));
-            } else {
-                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(nextTab));
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
     @Override
     public void onRowLongClicked(int inputPosition) {
         enableActionMode(inputPosition);

app/src/main/java/protect/card_locker/ManageGroupsActivity.java

@@ -150,8 +150,9 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT
         );
-        params.leftMargin = 50;
-        params.rightMargin = 50;
+        int contentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
+        params.leftMargin = contentPadding;
+        params.rightMargin = contentPadding;
         input.setLayoutParams(params);
         container.addView(input);
 

app/src/main/java/protect/card_locker/PermissionUtils.java

@@ -0,0 +1,94 @@
+package protect.card_locker;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.pm.PackageManager;
+import android.os.Build;
+
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+public class PermissionUtils {
+    /**
+     * Check if storage read permission is needed.
+     *
+     * This is only necessary on Android 6.0 (Marshmallow) and below. See
+     * https://github.com/CatimaLoyalty/Android/issues/979 for more info.
+     *
+     * @param activity
+     * @return
+     */
+    private static boolean needsStorageReadPermission(Activity activity) {
+        // Testing showed this permission wasn't needed for anything Catima did past Marshmallow
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            return false;
+        }
+
+        return ContextCompat.checkSelfPermission(activity, android.Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED;
+    }
+
+    /**
+     * Check if camera permission is needed.
+     *
+     * @param activity
+     * @return
+     */
+    public static boolean needsCameraPermission(Activity activity) {
+        // Android only introduced the runtime permission system in Marshmallow (Android 6.0)
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            return false;
+        }
+
+        return ContextCompat.checkSelfPermission(activity, android.Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED;
+    }
+
+    /**
+     * Call onRequestPermissionsResult after storage read permission was granted.
+     * Mocks a successful grant if a grant is not necessary.
+     *
+     * @param activity
+     * @param requestCode
+     */
+    public static void requestStorageReadPermission(CatimaAppCompatActivity activity, int requestCode) {
+        String[] permissions = new String[]{ android.Manifest.permission.READ_EXTERNAL_STORAGE };
+        int[] mockedResults = new int[]{ PackageManager.PERMISSION_GRANTED };
+
+        if (needsStorageReadPermission(activity)) {
+            ActivityCompat.requestPermissions(activity, permissions, requestCode);
+        } else {
+            // FIXME: This points to onMockedRequestPermissionResult instead of to
+            // onRequestPermissionResult because onRequestPermissionResult was only introduced in
+            // Android 6.0 (SDK 23) and we and to support Android 5.0 (SDK 21) too.
+            //
+            // When minSdk becomes 23, this should point to onRequestPermissionResult directly and
+            // the activity input variable should be changed from CatimaAppCompatActivity to
+            // Activity.
+            activity.onMockedRequestPermissionsResult(requestCode, permissions, mockedResults);
+        }
+    }
+
+    /**
+     * Call onRequestPermissionsResult after camera permission was granted.
+     * Mocks a successful grant if a grant is not necessary.
+     *
+     * @param activity
+     * @param requestCode
+     */
+    public static void requestCameraPermission(CatimaAppCompatActivity activity, int requestCode) {
+        String[] permissions = new String[]{ Manifest.permission.CAMERA };
+        int[] mockedResults = new int[]{ PackageManager.PERMISSION_GRANTED };
+
+        if (needsCameraPermission(activity)) {
+            ActivityCompat.requestPermissions(activity, permissions, requestCode);
+        } else {
+            // FIXME: This points to onMockedRequestPermissionResult instead of to
+            // onRequestPermissionResult because onRequestPermissionResult was only introduced in
+            // Android 6.0 (SDK 23) and we and to support Android 5.0 (SDK 21) too.
+            //
+            // When minSdk becomes 23, this should point to onRequestPermissionResult directly and
+            // the activity input variable should be changed from CatimaAppCompatActivity to
+            // Activity.
+            activity.onMockedRequestPermissionsResult(requestCode, permissions, mockedResults);
+        }
+    }
+}

app/src/main/java/protect/card_locker/ScanActivity.java

@@ -21,7 +21,6 @@ import android.widget.Toast;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
 
 import androidx.core.content.ContextCompat;
@@ -53,6 +52,8 @@ public class ScanActivity extends CatimaAppCompatActivity {
     private static final int MEDIUM_SCALE_FACTOR_DIP = 460;
     private static final int COMPAT_SCALE_FACTOR_DIP = 320;
 
+    private static final int PERMISSION_SCAN_ADD_FROM_IMAGE = 100;
+
     private CaptureManager capture;
     private DecoratedBarcodeView barcodeScannerView;
 
@@ -192,27 +193,22 @@ public class ScanActivity extends CatimaAppCompatActivity {
     private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
         super.onActivityResult(requestCode, resultCode, intent);
 
-        BarcodeValues barcodeValues;
+        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
 
-        try {
-            barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
-        } catch (NullPointerException e) {
-            Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+        if (barcodeValues.isEmpty()) {
             return;
         }
 
-        if (!barcodeValues.isEmpty()) {
-            Intent manualResult = new Intent();
-            Bundle manualResultBundle = new Bundle();
-            manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, barcodeValues.content());
-            manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, barcodeValues.format());
-            if (addGroup != null) {
-                manualResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
-            }
-            manualResult.putExtras(manualResultBundle);
-            ScanActivity.this.setResult(RESULT_OK, manualResult);
-            finish();
+        Intent manualResult = new Intent();
+        Bundle manualResultBundle = new Bundle();
+        manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, barcodeValues.content());
+        manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, barcodeValues.format());
+        if (addGroup != null) {
+            manualResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
         }
+        manualResult.putExtras(manualResultBundle);
+        ScanActivity.this.setResult(RESULT_OK, manualResult);
+        finish();
     }
 
     public void addManually(View view) {
@@ -226,10 +222,19 @@ public class ScanActivity extends CatimaAppCompatActivity {
     }
 
     public void addFromImage(View view) {
+        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_IMAGE);
+    }
+
+    private void addFromImageAfterPermission() {
         Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
         photoPickerIntent.setType("image/*");
+        Intent contentIntent = new Intent(Intent.ACTION_GET_CONTENT);
+        contentIntent.setType("image/*");
+
+        Intent chooserIntent = Intent.createChooser(photoPickerIntent, getString(R.string.addFromImage));
+        chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] { contentIntent });
         try {
-            photoPickerLauncher.launch(photoPickerIntent);
+            photoPickerLauncher.launch(chooserIntent);
         } catch (ActivityNotFoundException e) {
             Toast.makeText(getApplicationContext(), R.string.failedLaunchingPhotoPicker, Toast.LENGTH_LONG).show();
             Log.e(TAG, "No activity found to handle intent", e);
@@ -240,7 +245,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
         customBarcodeScannerBinding.cameraPermissionDeniedLayout.cameraPermissionDeniedClickableArea.setOnClickListener(show ? v -> {
             navigateToSystemPermissionSetting();
         } : null);
-        customBarcodeScannerBinding.cardInputContainer.setBackgroundColor(show ? obtainThemeAttribute(R.attr.colorSurface) : Color.TRANSPARENT);
+        customBarcodeScannerBinding.cardInputContainer.setBackgroundColor(show ? obtainThemeAttribute(com.google.android.material.R.attr.colorSurface) : Color.TRANSPARENT);
         customBarcodeScannerBinding.cameraPermissionDeniedLayout.getRoot().setVisibility(show ? View.VISIBLE : View.GONE);
     }
 
@@ -270,9 +275,21 @@ public class ScanActivity extends CatimaAppCompatActivity {
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == CaptureManager.getCameraPermissionReqCode())
-            showCameraPermissionMissingText(grantResults[0] != PackageManager.PERMISSION_GRANTED);
 
+        onMockedRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
+    public void onMockedRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        boolean granted = grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED;
+
+        if (requestCode == CaptureManager.getCameraPermissionReqCode()) {
+            showCameraPermissionMissingText(!granted);
+        } else if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE) {
+            if (granted) {
+                addFromImageAfterPermission();
+            } else {
+                Toast.makeText(this, R.string.storageReadPermissionRequired, Toast.LENGTH_LONG).show();
+            }
+        }
+    }
 }

app/src/main/java/protect/card_locker/UCropWrapper.java

@@ -53,8 +53,8 @@ public class UCropWrapper extends UCropActivity {
                         AppCompatImageView controlsBackgroundImage = (AppCompatImageView) check;
                         // everything gathered and are as expected, now perform color patching
                         Utils.patchColors(this);
-                        int colorSurface = MaterialColors.getColor(this, R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
-                        int colorOnSurface = MaterialColors.getColor(this, R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
+                        int colorSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
+                        int colorOnSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
 
                         Drawable controlsBackgroundImageDrawable = controlsBackgroundImage.getBackground();
                         controlsBackgroundImageDrawable.mutate();

app/src/main/java/protect/card_locker/Utils.java

@@ -18,6 +18,9 @@ import android.provider.MediaStore;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.RawRes;
@@ -45,7 +48,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.text.NumberFormat;
@@ -113,6 +115,17 @@ public class Utils {
         return ColorUtils.calculateLuminance(backgroundColor) > LUMINANCE_MIDPOINT;
     }
 
+    /**
+     * Returns the Barcode format and content based on the result of an activity.
+     * It shows toasts to notify the end-user as needed itself and will return an empty
+     * BarcodeValues object if the activity was cancelled or nothing could be found.
+     *
+     * @param requestCode
+     * @param resultCode
+     * @param intent
+     * @param context
+     * @return BarcodeValues
+     */
     static public BarcodeValues parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
         String contents;
         String format;
@@ -124,9 +137,15 @@ public class Utils {
         if (requestCode == Utils.BARCODE_IMPORT_FROM_IMAGE_FILE) {
             Log.i(TAG, "Received image file with possible barcode");
 
+            Uri data = intent.getData();
+            if (data == null) {
+                Log.e(TAG, "Intent did not contain any data");
+                Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+                return new BarcodeValues(null, null);
+            }
+
             Bitmap bitmap;
             try {
-                Uri data = intent.getData();
                 bitmap = retrieveImageFromUri(context, data);
             } catch (IOException e) {
                 Log.e(TAG, "Error getting data from image file");
@@ -214,7 +233,21 @@ public class Utils {
         }
     }
 
+    static public Boolean isNotYetValid(Date validFromDate) {
+        // The note in `hasExpired` does not apply here, since the bug was fixed before this feature was added.
+        return validFromDate.after(getStartOfToday().getTime());
+    }
+
     static public Boolean hasExpired(Date expiryDate) {
+        // Note: In #1083 it was discovered that `DatePickerFragment` may sometimes store the expiryDate
+        // at 12:00 PM instead of 12:00 AM in the DB. While this has been fixed and the 12-hour difference
+        // is not a problem for the way the comparison currently works, it's good to keep in mind such
+        // dates may exist in the DB in case the comparison changes in the future and the new one relies
+        // on both dates being set at 12:00 AM.
+        return expiryDate.before(getStartOfToday().getTime());
+    }
+
+    static private Calendar getStartOfToday() {
         // today
         Calendar date = new GregorianCalendar();
         // reset hour, minutes, seconds and millis
@@ -222,13 +255,7 @@ public class Utils {
         date.set(Calendar.MINUTE, 0);
         date.set(Calendar.SECOND, 0);
         date.set(Calendar.MILLISECOND, 0);
-
-        // Note: In #1083 it was discovered that `DatePickerFragment` may sometimes store the expiryDate
-        // at 12:00 PM instead of 12:00 AM in the DB. While this has been fixed and the 12-hour difference
-        // is not a problem for the way the comparison currently works, it's good to keep in mind such
-        // dates may exist in the DB in case the comparison changes in the future and the new one relies
-        // on both dates being set at 12:00 AM.
-        return expiryDate.before(date.getTime());
+        return date;
     }
 
     static public String formatBalance(Context context, BigDecimal value, Currency currency) {
@@ -548,7 +575,7 @@ public class Utils {
             return fallback;
         }
 
-        return new Palette.Builder(image).generate().getDominantColor(R.attr.colorPrimary);
+        return new Palette.Builder(image).generate().getDominantColor(androidx.appcompat.R.attr.colorPrimary);
     }
 
     public static int getRandomHeaderColor(Context context) {
@@ -575,4 +602,39 @@ public class Utils {
 
         return result.toString();
     }
+
+    public static void setIconOrTextWithBackground(Context context, LoyaltyCard loyaltyCard, ImageView backgroundOrIcon, TextView textWhenNoImage) {
+        Bitmap icon = Utils.retrieveCardImage(context, loyaltyCard.id, ImageLocationType.icon);
+        if (icon != null) {
+            Log.d("onResume", "setting icon image");
+            textWhenNoImage.setVisibility(View.GONE);
+
+            backgroundOrIcon.setImageBitmap(icon);
+            backgroundOrIcon.setBackgroundColor(Color.TRANSPARENT);
+        } else {
+            textWhenNoImage.setVisibility(View.VISIBLE);
+
+            int headerColor = loyaltyCard.headerColor != null ? loyaltyCard.headerColor : LetterBitmap.getDefaultColor(context, loyaltyCard.store);
+
+            backgroundOrIcon.setImageBitmap(null);
+            backgroundOrIcon.setBackgroundColor(headerColor);
+            textWhenNoImage.setText(loyaltyCard.store);
+            textWhenNoImage.setTextColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
+        }
+    }
+
+    public static boolean installedFromGooglePlay(Context context) {
+        try {
+            String packageName = context.getPackageName();
+            String installer;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                installer = context.getPackageManager().getInstallSourceInfo(packageName).getInstallingPackageName();
+            } else {
+                installer = context.getPackageManager().getInstallerPackageName(packageName);
+            }
+            return installer.equals("com.android.vending");
+        } catch (Throwable ignored) {
+            return false;
+        }
+    }
 }

app/src/main/java/protect/card_locker/importexport/CSVHelpers.java

@@ -8,22 +8,14 @@ public class CSVHelpers {
     /**
      * Extract a string from the items array. The index into the array
      * is determined by looking up the index in the fields map using the
-     * "key" as the key. If no such key exists, defaultValue is returned
-     * if it is not null. Otherwise, a FormatException is thrown.
+     * "key" as the key. If no such key exists, defaultValue is returned.
      */
-    static String extractString(String key, CSVRecord record, String defaultValue)
-            throws FormatException {
-        String toReturn = defaultValue;
-
+    static String extractString(String key, CSVRecord record, String defaultValue) {
         if (record.isMapped(key)) {
-            toReturn = record.get(key);
-        } else {
-            if (defaultValue == null) {
-                throw new FormatException("Field not used but expected: " + key);
-            }
+            return record.get(key);
         }
 
-        return toReturn;
+        return defaultValue;
     }
 
     /**
@@ -32,15 +24,15 @@ public class CSVHelpers {
      * "key" as the key. If no such key exists, or the data is not a valid
      * int, a FormatException is thrown.
      */
-    static Integer extractInt(String key, CSVRecord record, boolean nullIsOk)
+    static Integer extractInt(String key, CSVRecord record)
             throws FormatException {
-        if (record.isMapped(key) == false) {
+        if (!record.isMapped(key)) {
             throw new FormatException("Field not used but expected: " + key);
         }
 
         String value = record.get(key);
-        if (value.isEmpty() && nullIsOk) {
-            return null;
+        if (value.isEmpty()) {
+            throw new FormatException("Field is empty: " + key);
         }
 
         try {
@@ -56,15 +48,15 @@ public class CSVHelpers {
      * "key" as the key. If no such key exists, or the data is not a valid
      * int, a FormatException is thrown.
      */
-    static Long extractLong(String key, CSVRecord record, boolean nullIsOk)
+    static Long extractLong(String key, CSVRecord record)
             throws FormatException {
-        if (record.isMapped(key) == false) {
+        if (!record.isMapped(key)) {
             throw new FormatException("Field not used but expected: " + key);
         }
 
         String value = record.get(key);
-        if (value.isEmpty() && nullIsOk) {
-            return null;
+        if (value.isEmpty()) {
+            throw new FormatException("Field is empty: " + key);
         }
 
         try {

app/src/main/java/protect/card_locker/importexport/CatimaExporter.java

@@ -127,6 +127,7 @@ public class CatimaExporter implements Exporter {
         printer.printRecord(DBHelper.LoyaltyCardDbIds.ID,
                 DBHelper.LoyaltyCardDbIds.STORE,
                 DBHelper.LoyaltyCardDbIds.NOTE,
+                DBHelper.LoyaltyCardDbIds.VALID_FROM,
                 DBHelper.LoyaltyCardDbIds.EXPIRY,
                 DBHelper.LoyaltyCardDbIds.BALANCE,
                 DBHelper.LoyaltyCardDbIds.BALANCE_TYPE,
@@ -146,6 +147,7 @@ public class CatimaExporter implements Exporter {
             printer.printRecord(card.id,
                     card.store,
                     card.note,
+                    card.validFrom != null ? card.validFrom.getTime() : "",
                     card.expiry != null ? card.expiry.getTime() : "",
                     card.balance,
                     card.balanceType,

app/src/main/java/protect/card_locker/importexport/CatimaImporter.java

@@ -77,7 +77,7 @@ public class CatimaImporter implements Importer {
         int version = parseVersion(bufferedReader);
         switch (version) {
             case 1:
-                parseV1(context, database, bufferedReader);
+                parseV1(database, bufferedReader);
                 break;
             case 2:
                 parseV2(context, database, bufferedReader);
@@ -87,12 +87,12 @@ public class CatimaImporter implements Importer {
         }
     }
 
-    public void parseV1(Context context, SQLiteDatabase database, BufferedReader input) throws IOException, FormatException, InterruptedException {
+    public void parseV1(SQLiteDatabase database, BufferedReader input) throws IOException, FormatException, InterruptedException {
         final CSVParser parser = new CSVParser(input, CSVFormat.RFC4180.builder().setHeader().build());
 
         try {
             for (CSVRecord record : parser) {
-                importLoyaltyCard(context, database, record);
+                importLoyaltyCard(database, record);
 
                 if (Thread.currentThread().isInterrupted()) {
                     throw new InterruptedException();
@@ -214,7 +214,7 @@ public class CatimaImporter implements Importer {
         }
 
         for (CSVRecord record : records) {
-            importLoyaltyCard(context, database, record);
+            importLoyaltyCard(database, record);
         }
     }
 
@@ -276,9 +276,9 @@ public class CatimaImporter implements Importer {
      * Import a single loyalty card into the database using the given
      * session.
      */
-    private void importLoyaltyCard(Context context, SQLiteDatabase database, CSVRecord record)
-            throws IOException, FormatException {
-        int id = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ID, record, false);
+    private void importLoyaltyCard(SQLiteDatabase database, CSVRecord record)
+            throws FormatException {
+        int id = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ID, record);
 
         String store = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.STORE, record, "");
         if (store.isEmpty()) {
@@ -286,19 +286,38 @@ public class CatimaImporter implements Importer {
         }
 
         String note = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.NOTE, record, "");
-        Date expiry = null;
+
+        Date validFrom = null;
+        Long validFromLong;
         try {
-            expiry = new Date(CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.EXPIRY, record, true));
-        } catch (NullPointerException | FormatException e) {
+            validFromLong = CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.VALID_FROM, record);
+        } catch (FormatException ignored) {
+            validFromLong = null;
+        }
+        if (validFromLong != null) {
+            validFrom = new Date(validFromLong);
         }
 
-        BigDecimal balance;
+        Date expiry = null;
+        Long expiryLong;
         try {
-            balance = new BigDecimal(CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE, record, null));
-        } catch (FormatException _e) {
-            // These fields did not exist in versions 1.8.1 and before
-            // We catch this exception so we can still import old backups
-            balance = new BigDecimal("0");
+            expiryLong = CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.EXPIRY, record);
+        } catch (FormatException ignored) {
+            expiryLong = null;
+        }
+        if (expiryLong != null) {
+            expiry = new Date(expiryLong);
+        }
+
+        // These fields did not exist in versions 1.8.1 and before
+        // We default to 0 so we can still import old backups
+        BigDecimal balance = new BigDecimal("0");
+        String balanceString = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE, record, null);
+        if (balanceString != null) {
+            try {
+                balance = new BigDecimal(CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE, record, null));
+            } catch (NumberFormatException ignored) {
+            }
         }
 
         Currency balanceType = null;
@@ -324,14 +343,14 @@ public class CatimaImporter implements Importer {
         }
 
         Integer headerColor = null;
-
-        if (record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)) {
-            headerColor = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record, true);
+        try {
+            headerColor = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record);
+        } catch (FormatException ignored) {
         }
 
         int starStatus = 0;
         try {
-            starStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record, false);
+            starStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record);
         } catch (FormatException _e) {
             // This field did not exist in versions 0.28 and before
             // We catch this exception so we can still import old backups
@@ -340,7 +359,7 @@ public class CatimaImporter implements Importer {
 
         int archiveStatus = 0;
         try {
-            archiveStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS, record, false);
+            archiveStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS, record);
         } catch (FormatException _e) {
             // This field did not exist in versions 2.16.3 and before
             // We catch this exception so we can still import old backups
@@ -349,13 +368,13 @@ public class CatimaImporter implements Importer {
 
         Long lastUsed = 0L;
         try {
-            lastUsed = CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.LAST_USED, record, false);
+            lastUsed = CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.LAST_USED, record);
         } catch (FormatException _e) {
             // This field did not exist in versions 2.5.0 and before
             // We catch this exception so we can still import old backups
         }
 
-        DBHelper.insertLoyaltyCard(database, id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus, lastUsed, archiveStatus);
+        DBHelper.insertLoyaltyCard(database, id, store, note, validFrom, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus, lastUsed, archiveStatus);
     }
 
     /**
@@ -365,6 +384,10 @@ public class CatimaImporter implements Importer {
     private void importGroup(SQLiteDatabase database, CSVRecord record) throws FormatException {
         String id = CSVHelpers.extractString(DBHelper.LoyaltyCardDbGroups.ID, record, null);
 
+        if (id == null) {
+            throw new FormatException("Group has no ID: " + record);
+        }
+
         DBHelper.insertGroup(database, id);
     }
 
@@ -373,11 +396,15 @@ public class CatimaImporter implements Importer {
      * session.
      */
     private void importCardGroupMapping(SQLiteDatabase database, CSVRecord record) throws FormatException {
-        Integer cardId = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIdsGroups.cardID, record, false);
+        int cardId = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIdsGroups.cardID, record);
         String groupId = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIdsGroups.groupID, record, null);
 
+        if (groupId == null) {
+            throw new FormatException("Group has no ID: " + record);
+        }
+
         List<Group> cardGroups = DBHelper.getLoyaltyCardGroups(database, cardId);
         cardGroups.add(DBHelper.getGroup(database, groupId));
         DBHelper.setLoyaltyCardGroups(database, cardId, cardGroups);
     }
-}
+}

app/src/main/java/protect/card_locker/importexport/FidmeImporter.java

@@ -128,6 +128,6 @@ public class FidmeImporter implements Importer {
 
         // TODO: Front and back image
 
-        DBHelper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, headerColor, starStatus, null,archiveStatus);
+        DBHelper.insertLoyaltyCard(database, store, note, null, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, headerColor, starStatus, null,archiveStatus);
     }
 }

app/src/main/java/protect/card_locker/importexport/StocardImporter.java

@@ -74,29 +74,31 @@ public class StocardImporter implements Importer {
             String fileName = localFileHeader.getFileName();
             String[] nameParts = fileName.split("/");
 
+            if (nameParts.length < 2) {
+                continue;
+            }
+
             if (providersFileName == null) {
                 providersFileName = new String[]{
-                        nameParts[0],
-                        "sync",
-                        "data",
+                        "extracts",
+                        nameParts[1],
                         "users",
-                        nameParts[0],
-                        "analytics-properties.json"
+                        nameParts[1],
+                        "analytics-properties",
+                        "content.json"
                 };
                 customProvidersBaseName = new String[]{
-                        nameParts[0],
-                        "sync",
-                        "data",
+                        "extracts",
+                        nameParts[1],
                         "users",
-                        nameParts[0],
+                        nameParts[1],
                         "loyalty-card-custom-providers"
                 };
                 cardBaseName = new String[]{
-                        nameParts[0],
-                        "sync",
-                        "data",
+                        "extracts",
+                        nameParts[1],
                         "users",
-                        nameParts[0],
+                        nameParts[1],
                         "loyalty-cards"
                 };
             }
@@ -106,18 +108,15 @@ public class StocardImporter implements Importer {
                 customProviderId = nameParts[customProvidersBaseName.length].split("\\.", 2)[0];
 
                 // Name file
-                if (nameParts.length == customProvidersBaseName.length + 1) {
-                    // Ignore the .txt file
-                    if (fileName.endsWith(".json")) {
-                        JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
+                if (fileName.endsWith(customProviderId + "/content.json")) {
+                    JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
 
-                        providers = appendToHashMap(
-                                providers,
-                                customProviderId,
-                                "name",
-                                jsonObject.getString("name")
-                        );
-                    }
+                    providers = appendToHashMap(
+                            providers,
+                            customProviderId,
+                            "name",
+                            jsonObject.getString("name")
+                    );
                 } else if (fileName.endsWith("logo.png")) {
                     providers = appendToHashMap(
                             providers,
@@ -133,46 +132,43 @@ public class StocardImporter implements Importer {
                 cardName = nameParts[cardBaseName.length].split("\\.", 2)[0];
 
                 // This is the card itself
-                if (nameParts.length == cardBaseName.length + 1) {
-                    // Ignore the .txt file
-                    if (fileName.endsWith(".json")) {
-                        JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
+                if (fileName.endsWith(cardName + "/content.json")) {
+                    JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
 
-                        loyaltyCardHashMap = appendToHashMap(
-                                loyaltyCardHashMap,
-                                cardName,
-                                "cardId",
-                                jsonObject.getString("input_id")
-                        );
+                    loyaltyCardHashMap = appendToHashMap(
+                            loyaltyCardHashMap,
+                            cardName,
+                            "cardId",
+                            jsonObject.getString("input_id")
+                    );
 
-                        // Provider ID can be either custom or not, extract whatever version is relevant
-                        String customProviderPrefix = "/users/" + nameParts[0] + "/loyalty-card-custom-providers/";
-                        String providerId = jsonObject
-                                .getJSONObject("input_provider_reference")
-                                .getString("identifier");
-                        if (providerId.startsWith(customProviderPrefix)) {
-                            providerId = providerId.substring(customProviderPrefix.length());
-                        } else {
-                            providerId = providerId.substring("/loyalty-card-providers/".length());
-                        }
-
-                        loyaltyCardHashMap = appendToHashMap(
-                                loyaltyCardHashMap,
-                                cardName,
-                                "_providerId",
-                                providerId
-                        );
-
-                        if (jsonObject.has("input_barcode_format")) {
-                            loyaltyCardHashMap = appendToHashMap(
-                                    loyaltyCardHashMap,
-                                    cardName,
-                                    "barcodeType",
-                                    jsonObject.getString("input_barcode_format")
-                            );
-                        }
+                    // Provider ID can be either custom or not, extract whatever version is relevant
+                    String customProviderPrefix = "/users/" + nameParts[1] + "/loyalty-card-custom-providers/";
+                    String providerId = jsonObject
+                            .getJSONObject("input_provider_reference")
+                            .getString("identifier");
+                    if (providerId.startsWith(customProviderPrefix)) {
+                        providerId = providerId.substring(customProviderPrefix.length());
+                    } else {
+                        providerId = providerId.substring("/loyalty-card-providers/".length());
                     }
-                } else if (fileName.endsWith("notes/default.json")) {
+
+                    loyaltyCardHashMap = appendToHashMap(
+                            loyaltyCardHashMap,
+                            cardName,
+                            "_providerId",
+                            providerId
+                    );
+
+                    if (jsonObject.has("input_barcode_format")) {
+                        loyaltyCardHashMap = appendToHashMap(
+                                loyaltyCardHashMap,
+                                cardName,
+                                "barcodeType",
+                                jsonObject.getString("input_barcode_format")
+                        );
+                    }
+                } else if (fileName.endsWith("notes/default/content.json")) {
                     loyaltyCardHashMap = appendToHashMap(
                             loyaltyCardHashMap,
                             cardName,
@@ -234,7 +230,7 @@ public class StocardImporter implements Importer {
                 headerColor = Utils.getHeaderColorFromImage(cardIcon, headerColor);
             }
 
-            long loyaltyCardInternalId = DBHelper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, headerColor, 0, null,0);
+            long loyaltyCardInternalId = DBHelper.insertLoyaltyCard(database, store, note, null, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, headerColor, 0, null,0);
 
             if (cardIcon != null) {
                 Utils.saveCardImage(context, cardIcon, (int) loyaltyCardInternalId, ImageLocationType.icon);

app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java

@@ -126,7 +126,7 @@ public class VoucherVaultImporter implements Importer {
                     throw new FormatException("Unknown colour type found: " + colorFromJSON);
             }
 
-            DBHelper.insertLoyaltyCard(database, store, "", expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0, Utils.getUnixTime(),0);
+            DBHelper.insertLoyaltyCard(database, store, "", null, expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0, Utils.getUnixTime(),0);
         }
 
         bufferedReader.close();

app/src/main/java/protect/card_locker/preferences/Settings.java

@@ -63,30 +63,6 @@ public class Settings {
         return AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
     }
 
-    public double getFontSizeScale() {
-        return getInt(R.string.settings_key_max_font_size_scale, R.integer.settings_max_font_size_scale_pct) / 100.0;
-    }
-
-    public int getSmallFont() {
-        return 14;
-    }
-
-    public int getMediumFont() {
-        return 28;
-    }
-
-    public int getLargeFont() {
-        return 40;
-    }
-
-    public int getFontSizeMin(int fontSize) {
-        return (int) (Math.round(fontSize / 2.0) - 1);
-    }
-
-    public int getFontSizeMax(int fontSize) {
-        return (int) Math.round(fontSize * getFontSizeScale());
-    }
-
     public boolean useMaxBrightnessDisplayingBarcode() {
         return getBoolean(R.string.settings_key_display_barcode_max_brightness, true);
     }

app/src/main/java/protect/card_locker/preferences/SettingsActivity.java

@@ -13,18 +13,13 @@ import java.util.List;
 import java.util.Locale;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.FragmentResultListener;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
-import kotlin.Suppress;
-import nl.invissvenska.numberpickerpreference.NumberDialogPreference;
-import nl.invissvenska.numberpickerpreference.NumberPickerPreferenceDialogFragment;
 import protect.card_locker.CatimaAppCompatActivity;
 import protect.card_locker.MainActivity;
 import protect.card_locker.R;
@@ -164,30 +159,5 @@ public class SettingsActivity extends CatimaAppCompatActivity {
                 activity.recreate();
             }
         }
-
-        @Override
-        @SuppressWarnings("deprecation") // setTargetFragment
-        // androidx.preference.PreferenceDialogFragmentCompat uses the deprecated method
-        // `getTargetFragment()`, which throws if `setTargetFragment()` isn't used before.
-        // While this isn't fixed on upstream, suppress the deprecation warning
-        // https://issuetracker.google.com/issues/181793702
-        public void onDisplayPreferenceDialog(Preference preference) {
-            if (preference instanceof NumberDialogPreference) {
-                NumberDialogPreference dialogPreference = (NumberDialogPreference) preference;
-                DialogFragment dialogFragment = NumberPickerPreferenceDialogFragment
-                        .newInstance(
-                                dialogPreference.getKey(),
-                                dialogPreference.getMinValue(),
-                                dialogPreference.getMaxValue(),
-                                dialogPreference.getStepValue(),
-                                dialogPreference.getUnitText()
-                        );
-                dialogFragment.setTargetFragment(this, 0);
-                dialogFragment.show(getParentFragmentManager(), DIALOG_FRAGMENT_TAG);
-            } else {
-                super.onDisplayPreferenceDialog(preference);
-            }
-        }
     }
 }
-

app/src/main/res/drawable/active_dot.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval" android:useLevel="true"
-    android:dither="true">
-
-    <size android:height="12dip" android:width="12dip"/>
-
-    <solid android:color="@android:color/white"/>
-</shape>

app/src/main/res/drawable/dialog_bg_monet.xml

@@ -0,0 +1,24 @@
+<layer-list xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="?attr/colorSurface" />
+            <corners
+                android:bottomLeftRadius="28dp"
+                android:bottomRightRadius="28dp"
+                android:topLeftRadius="28dp"
+                android:topRightRadius="28dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/m3_popupmenu_overlay_color"
+                tools:ignore="PrivateResource" />
+            <corners
+                android:bottomLeftRadius="28dp"
+                android:bottomRightRadius="28dp"
+                android:topLeftRadius="28dp"
+                android:topRightRadius="28dp" />
+        </shape>
+    </item>
+</layer-list>

app/src/main/res/drawable/ic_baseline_chevron_left_24.xml

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>

app/src/main/res/drawable/ic_baseline_chevron_right_24.xml

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>

app/src/main/res/drawable/ic_baseline_expand_more_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
+</vector>

app/src/main/res/drawable/ic_close.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>

app/src/main/res/drawable/ic_lock_open_white_24dp.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/>
-</vector>

app/src/main/res/drawable/ic_share_white.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
-</vector>

app/src/main/res/drawable/ic_starred.xml

@@ -1,5 +1,5 @@
-<vector android:autoMirrored="true" android:height="24dp" android:tint="?attr/colorControlNormal"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
 </vector>

app/src/main/res/drawable/ic_unstarred.xml

@@ -1,5 +1,5 @@
 <vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
 </vector>

app/src/main/res/drawable/ic_valid_from_24dp.xml

@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z" />
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M18,15.782V22l4.886,-3.109z" />
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11.99,2C6.47,2 2,6.48 2,12C2,17.52 6.47,22 11.99,22C13.417,22 14.772,21.699 16,21.162L16,18.928C14.823,19.608 13.458,20 12,20C7.58,20 4,16.42 4,12C4,7.58 7.58,4 12,4C16.42,4 20,7.58 20,12C20,13.061 19.791,14.073 19.416,15L21.541,15C21.839,14.053 22,13.045 22,12C22,6.48 17.52,2 11.99,2zM11,7L11,13L16,16L16,15L16.951,15L17,14.92L12.5,12.25L12.5,7L11,7z" />
+</vector>

app/src/main/res/drawable/inactive_dot.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval" android:useLevel="true"
-    android:dither="true">
-
-    <size android:height="8dip" android:width="8dip"/>
-
-    <solid android:color="@android:color/white"/>
-</shape>

app/src/main/res/layout/about_activity.xml

@@ -271,6 +271,36 @@
                     app:layout_constraintTop_toTopOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/donate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
+
+                <TextView
+                    android:id="@+id/donate_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/donate"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:importantForAccessibility="no"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/rate"
                 android:layout_width="match_parent"

app/src/main/res/layout/group_layout.xml

@@ -37,36 +37,48 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <ImageButton
+        <Button
             android:id="@+id/moveUp"
-            android:layout_width="@dimen/cardThumbnailSize"
-            android:layout_height="@dimen/cardThumbnailSize"
+            style="?attr/materialIconButtonFilledStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
+            app:icon="@drawable/ic_baseline_arrow_drop_up_24"
+            app:iconGravity="textStart"
+            app:tint="?attr/colorOnPrimary"
             android:contentDescription="@string/moveUp"/>
 
-        <ImageButton
+        <Button
             android:id="@+id/moveDown"
-            android:layout_width="@dimen/cardThumbnailSize"
-            android:layout_height="@dimen/cardThumbnailSize"
+            style="?attr/materialIconButtonFilledStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
+            app:icon="@drawable/ic_baseline_arrow_drop_down_24"
+            app:iconGravity="textStart"
+            app:tint="?attr/colorOnPrimary"
             android:contentDescription="@string/moveDown"/>
 
-        <ImageButton
+        <Button
             android:id="@+id/edit"
-            android:layout_width="@dimen/cardThumbnailSize"
-            android:layout_height="@dimen/cardThumbnailSize"
+            style="?attr/materialIconButtonFilledStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            app:srcCompat="@drawable/ic_mode_edit_white_24dp"
+            app:icon="@drawable/ic_mode_edit_white_24dp"
+            app:iconGravity="textStart"
+            app:tint="?attr/colorOnPrimary"
             android:contentDescription="@string/edit"/>
 
-        <ImageButton
+        <Button
             android:id="@+id/delete"
-            android:layout_width="@dimen/cardThumbnailSize"
-            android:layout_height="@dimen/cardThumbnailSize"
+            style="?attr/materialIconButtonFilledStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            app:srcCompat="@drawable/ic_delete_white_24dp"
+            app:icon="@drawable/ic_delete_white_24dp"
+            app:iconGravity="textStart"
+            app:tint="?attr/colorOnPrimary"
             android:contentDescription="@string/delete"/>
 
     </LinearLayout>

app/src/main/res/layout/loyalty_card_edit_activity.xml

@@ -288,7 +288,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="numberDecimal"
-                            android:digits="0123456789.,$" />
+                            android:digits="0123456789,." />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -311,6 +311,32 @@
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
 
+                <!-- Valid from -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="@dimen/inputPadding"
+                    android:paddingTop="@dimen/inputPadding"
+                    android:orientation="horizontal">
+
+                    <!-- Valid from -->
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/validFromView"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.0"
+                        android:hint="@string/validFromDate"
+                        android:labelFor="@+id/validFromField">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/validFromField"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="none"/>
+                    </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
+
                 <!-- Expiration -->
                 <LinearLayout
                     android:layout_width="match_parent"

app/src/main/res/layout/loyalty_card_layout.xml

@@ -9,8 +9,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp">
+        android:layout_height="wrap_content">
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/icon_layout"
@@ -19,12 +18,11 @@
             android:outlineProvider="none"
             app:cardCornerRadius="8dp"
             app:strokeWidth="0dp"
-            app:layout_constraintBottom_toTopOf="@+id/store"
+            app:layout_constraintBottom_toTopOf="@+id/note"
             app:layout_constraintDimensionRatio="85.6f:53.98f"
             app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
-                android:importantForAccessibility="no"
                 android:id="@+id/thumbnail"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -36,6 +34,20 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <TextView
+                android:id="@+id/thumbnail_text"
+                android:importantForAccessibility="no"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:textStyle="bold"
+                app:autoSizeTextType="uniform"
+                app:autoSizeMinTextSize="12sp"
+                app:autoSizeMaxTextSize="100sp"
+                app:autoSizeStepGranularity="2sp"
+                android:gravity="center"
+                android:maxLines="1"
+                android:layout_margin="20dp" />
+
             <ImageView
                 android:importantForAccessibility="no"
                 android:id="@+id/selected_thumbnail"
@@ -117,20 +129,6 @@
 
         </com.google.android.material.card.MaterialCardView>
 
-        <TextView
-            android:id="@+id/store"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="4dp"
-            android:textAppearance="?attr/textAppearanceHeadline1"
-            app:layout_constraintTop_toBottomOf="@+id/icon_layout"
-            app:layout_constraintBottom_toTopOf="@+id/note"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:text="Example store"/>
-
         <TextView
             android:id="@+id/note"
             android:layout_width="match_parent"
@@ -142,7 +140,7 @@
             android:textColor="?android:attr/textColorSecondary"
             android:visibility="gone"
             tools:visibility="visible"
-            app:layout_constraintTop_toBottomOf="@+id/store"
+            app:layout_constraintTop_toBottomOf="@+id/icon_layout"
             app:layout_constraintBottom_toTopOf="@+id/info_divider"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -167,6 +165,7 @@
             android:id="@+id/balance"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:gravity="center_vertical"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
@@ -176,16 +175,37 @@
             android:drawablePadding="4dp"
             android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@+id/info_divider"
-            app:layout_constraintBottom_toTopOf="@+id/expiry"
+            app:layout_constraintBottom_toTopOf="@+id/validFrom"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             tools:visibility="visible"
             tools:text="525 points"/>
 
+        <TextView
+            android:id="@+id/validFrom"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="4dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
+            app:drawableLeftCompat="@drawable/ic_valid_from_24dp"
+            android:drawablePadding="4dp"
+            android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@+id/balance"
+            app:layout_constraintBottom_toTopOf="@+id/expiry"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:visibility="visible"
+            tools:text="Today"/>
+
         <TextView
             android:id="@+id/expiry"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:gravity="center_vertical"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
@@ -194,7 +214,7 @@
             app:drawableLeftCompat="@drawable/ic_baseline_access_time_24"
             android:drawablePadding="4dp"
             android:visibility="gone"
-            app:layout_constraintTop_toBottomOf="@+id/balance"
+            app:layout_constraintTop_toBottomOf="@+id/validFrom"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/loyalty_card_view_layout.xml

@@ -6,215 +6,198 @@
     android:id="@+id/coordinator_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:fitsSystemWindows="true">
-
+    android:fitsSystemWindows="false">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:color/transparent"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:fitsSystemWindows="true"
-        android:weightSum="1.0">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar_landscape"
-            android:layout_width="fill_parent"
-            android:layout_height="?actionBarSize"
-            android:background="@android:color/transparent"
-            android:fitsSystemWindows="false"
-            android:paddingTop="0dp"
-            android:visibility="gone"
-            app:contentInsetStart="72.0dip"
-            app:layout_collapseMode="pin" />
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            style="?attr/toolbarStyle" />
+    </com.google.android.material.appbar.AppBarLayout>
 
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsingToolbarLayout"
-            android:layout_width="fill_parent"
+    <LinearLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="?attr/actionBarSize"
+        android:layout_marginBottom="100dp"
+        android:orientation="vertical"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="0dp">
+
+        <LinearLayout
+            android:id="@+id/icon_container"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:minHeight="56.0dip"
-            app:contentScrim="?colorPrimary"
-            app:expandedTitleGravity="top"
-            app:expandedTitleMarginEnd="64dp"
-            app:expandedTitleMarginStart="48dp">
+            android:layout_marginBottom="20dp">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/storeName"
+            <Space
+                android:layout_width="50dp"
+                android:layout_height="0dp"/>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
+
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/icon_holder"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    app:cardCornerRadius="8dp"
+                    android:layout_margin="10dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintDimensionRatio="85.6f:53.98f">
+
+                    <ImageView
+                        android:id="@+id/icon_image"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"/>
+
+                    <TextView
+                        android:id="@+id/icon_text"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:textStyle="bold"
+                        app:autoSizeTextType="uniform"
+                        app:autoSizeMinTextSize="12sp"
+                        app:autoSizeMaxTextSize="100sp"
+                        app:autoSizeStepGranularity="2sp"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:layout_margin="20dp" />
+                </com.google.android.material.card.MaterialCardView>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <Space
+                android:layout_width="50dp"
+                android:layout_height="0dp"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="0dp">
+
+            <!-- We don't use these buttons for Talkback -->
+            <ImageButton
+                android:importantForAccessibility="no"
+                android:id="@+id/main_left_button"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                app:srcCompat="@drawable/ic_baseline_chevron_left_24"
+                android:background="@android:color/transparent"/>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/card_holder"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1">
+
+                <com.google.android.material.card.MaterialCardView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    app:cardCornerRadius="8dp"
+                    android:layout_margin="10dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_margin="4dp"
+                        android:orientation="vertical">
+
+                            <ImageView
+                                android:id="@+id/main_image"
+                                android:layout_width="match_parent"
+                                android:layout_height="0dp"
+                                android:layout_weight="1"/>
+
+                            <TextView
+                                android:id="@+id/card_id_view"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:textSize="@dimen/text_size_large"
+                                android:ellipsize="end"
+                                android:singleLine="true"
+                                android:gravity="center"/>
+                    </LinearLayout>
+                </com.google.android.material.card.MaterialCardView>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <!-- We don't use these buttons for Talkback -->
+            <ImageButton
+                android:importantForAccessibility="no"
+                android:id="@+id/main_right_button"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                app:srcCompat="@drawable/ic_baseline_chevron_right_24"
+                android:background="@android:color/transparent"/>
+        </LinearLayout>
+    </LinearLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/fullscreen_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ImageView
+            android:importantForAccessibility="no"
+            android:id="@+id/fullscreen_image"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/scaler_guideline"/>
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/scaler_guideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_percent="0.5"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toTopOf="@+id/fullscreen_button_minimize"
+            android:layout_marginBottom="50dp"
+            android:layout_marginStart="15.0dip"
+            android:layout_marginEnd="15.0dip">
+
+            <TextView
+                android:importantForAccessibility="no"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/height"/>
+
+            <SeekBar
+                android:id="@+id/barcode_scaler"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_marginTop="?actionBarSize"
-                android:layout_marginBottom="?actionBarSize"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textAlignment="center"
-                android:textColor="@android:color/white"
-                android:textSize="40sp"
-                app:layout_collapseMode="parallax" />
+                android:contentDescription="@string/setBarcodeHeight"
+                android:max="100" />
+        </LinearLayout>
 
-            <androidx.appcompat.widget.Toolbar
-                android:id="@id/toolbar"
-                android:layout_width="fill_parent"
-                android:layout_height="?actionBarSize"
-                android:background="@android:color/transparent"
-                app:contentInsetStart="72.0dip"
-                app:layout_collapseMode="pin" />
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <ImageView
-        android:id="@+id/icon_image"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_alignParentTop="true"
-        android:fitsSystemWindows="true"
-        android:scaleType="centerCrop"
-        app:srcCompat="@drawable/ic_launcher_foreground"
-        tools:ignore="ContentDescription" />
-
-    <FrameLayout
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/mainLayout"
-            android:layout_width="fill_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/centerGuideline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintGuide_percent="0.5"/>
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/scalerGuideline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintGuide_percent="0.75"/>
-
-            <ImageButton
-                android:id="@+id/maximizeButton"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="15.0dip"
-                android:background="?attr/colorPrimary"
-                android:contentDescription="@string/moveBarcodeToTopOfScreen"
-                android:padding="0dp"
-                android:visibility="gone"
-                app:layout_constraintBottom_toTopOf="@+id/mainImage"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
-                app:tint="?attr/colorOnPrimary"
-                tools:visibility="visible" />
-
-            <ImageView
-                android:id="@+id/mainImage"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:orientation="horizontal"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                app:layout_constraintBottom_toTopOf="@+id/centerGuideline"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/maximizeButton"/>
-
-            <ImageButton
-                android:id="@+id/minimizeButton"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="15.0dip"
-                android:background="?attr/colorPrimary"
-                android:contentDescription="@string/moveBarcodeToCenterOfScreen"
-                android:padding="0dp"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/mainImage"
-                app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
-                app:tint="?attr/colorOnPrimary"
-                tools:visibility="visible" />
-
-            <LinearLayout
-                android:id="@+id/dotIndicator"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="15.0dip"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/minimizeButton"
-                tools:visibility="visible" />
-
-            <SeekBar
-                android:id="@+id/barcodeScaler"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/inputPadding"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                android:contentDescription="@string/set_scale"
-                android:max="100"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/scalerGuideline" />
-
-            <TextView
-                android:id="@+id/cardIdView"
-                android:enabled="true"
-                android:textIsSelectable="true"
-                android:focusable="true"
-                android:longClickable="true"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginLeft="10.0dip"
-                android:layout_marginRight="10.0dip"
-                android:paddingBottom="80dp"
-                app:layout_constraintTop_toBottomOf="@+id/dotIndicator"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                android:textAlignment="center"
-                app:autoSizeTextType="uniform"
-                app:autoSizeMinTextSize="@dimen/singleCardCardIdTextSizeMin"
-                app:autoSizeMaxTextSize="@dimen/singleCardCardIdTextSizeMax"
-                android:ellipsize="end"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <View
-            android:id="@+id/drop_shadow_actionbar"
-            android:layout_width="fill_parent"
-            android:layout_height="5.0dip"
-            android:layout_gravity="top"/>
-    </FrameLayout>
+        <ImageButton
+            android:id="@+id/fullscreen_button_minimize"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_baseline_expand_more_24"
+            android:tooltipText="@string/moveDown"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginBottom="50dp"
+            android:background="@android:color/transparent"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.bottomappbar.BottomAppBar
         android:id="@+id/bottom_app_bar"
@@ -230,7 +213,7 @@
         app:fabAlignmentMode="center">
 
         <ImageButton
-            android:id="@+id/button_previous"
+            android:id="@+id/bottom_app_bar_previous_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="left"
@@ -242,7 +225,7 @@
             android:visibility="gone" />
 
         <ImageButton
-            android:id="@+id/button_show_info"
+            android:id="@+id/bottom_app_bar_info_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="start"
@@ -254,7 +237,7 @@
             android:visibility="gone" />
 
         <ImageButton
-            android:id="@+id/button_next"
+            android:id="@+id/bottom_app_bar_next_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="right"
@@ -266,7 +249,7 @@
             android:visibility="gone" />
 
         <ImageButton
-            android:id="@+id/button_update_balance"
+            android:id="@+id/bottom_app_bar_update_balance_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="end"

app/src/main/res/layout/preference_material_switch.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/switchWidget"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@null"
+    android:clickable="false"
+    android:focusable="false" />

app/src/main/res/layout/sorting_option.xml

@@ -15,7 +15,7 @@
             android:layout_marginLeft="20dp"
             android:paddingLeft="20dp"
             android:text="@string/reverse"
-            android:textSize="19sp"/>
+            android:textSize="16sp"/>
 
     </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/menu/card_update_menu.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_delete"
-        android:icon="@drawable/ic_delete_white_24dp"
-        android:title="@string/delete"
-        app:showAsAction="always"/>
-</menu>

app/src/main/res/menu/card_view_menu.xml

@@ -4,13 +4,13 @@
 
     <item
         android:id="@+id/action_share"
-        android:icon="@drawable/ic_share_white"
+        android:icon="@drawable/ic_share"
         android:title="@string/share"
         app:showAsAction="always"/>
 
     <item
         android:id="@+id/action_star_unstar"
-        android:icon="@drawable/ic_unstarred_white"
+        android:icon="@drawable/ic_unstarred"
         android:title="@string/star"
         app:showAsAction="always" />
 

app/src/main/res/raw/contributors.txt

@@ -10,42 +10,51 @@ mondstern
 IllusiveMan196
 StoyanDimitrov
 Altonss
-Petr Novák
 SlavekB
-Gediminas Murauskas
 Michael Moroni
+Gediminas Murauskas
+Petr Novák
 Joel A
 Taco
+laralem
 pfaffenrodt
 Nyatsuki
-laralem
+gallegonovato
+HudobniVolk
 Samantaz Fox
 arno-github
 Ankit Tiwari
 Sergio Paredes
 Aayush Gupta
 huuhaa
-gallegonovato
-arshbeerSingh
 Quentin PAGÈS
-Miha Frangež
-Arnis Jaundzeikars
-sr093906
+(Cliff Heraldo)
+Alexander Ivanov
+arshbeerSingh
+Balázs Meskó
+Denis Shilin
 Freddo espresso
+Giovanni Donisi
+Projjal Moitra
+Silvério Santos
+Miha Frangež
+Arnis Jaundžeikars
+Kefir2105
+sr093906
 mdvhimself
 Katarzyna
-Maciej Błędkowski
+echo r"0xX4H" | rev
 Magnitudee
 Olivia (Zoe)
 betsythefc
-Silvério Santos
 waffshappen
 Robin
 Eric
-Alexander Ivanov
 ati3
-Giovanni
+Evgeniy Khramov
 Jane Kong
+Jean Mareilles
+Jiri Grönroos
 K. Herbert
 Lisa A.
 Mawuena M. KODZO A.
@@ -54,7 +63,9 @@ Still Hsu
 String E. Fighter
 Tapu
 Yurical
+Eryk Michalak
 rr-vesp
+丛林意志
 alajemba-vik
 /usr/local/ΕΨΗΕΛΩΝ
 Adolfo Jayme-Barrientos
@@ -67,22 +78,29 @@ BootVirtual
 Clonewayx
 D. Domig
 Diego
+Eudes-alencar
 Fede Pujol
+francescbassas
 Jean-Luc Tibaux
+Jesse Davids
 Lukas Grassauer
+Luna Jernberg
 Marnick L'Eau
 Michalis
 Michał
+Milo Ivir
 Mohamed A. Salah
-Neko Nekowazarashi
+the7thNightmare
 Rishi Agarwal
 Rosdyana Kusuma
 umoenks
 Simon Rusinov
+Siriusmart
 Mritunjay
 Tarik Dzambic
 Thomas Bertels
 Thomas Cruveilher
+Tian Jiale
 Tong Liu
 Wanath
 Runner
@@ -90,52 +108,71 @@ ce i moa
 inesre
 lgasp
 phlostically
+pokeghost
+sal0max
 Ágata Leuck
+BmBKun
 Aditya Das
-Asier
+asier123123131
 Kevin Sicong Jiang
 Tomer Ben-Rachel
+Tom Sawyer
 tfuxu
 Ahmed Saleh
 Airat
+Alexander
 sNiXx
 Angela Enogieru
 AnimeshChatterjee1
+Artūras Kalenda
 Ashish Yadav
 Aya Elsaadany
 Biren
 Booc Sylvan
-Colgrave
+Brage Nesteby Reitan
+Cap Amr Karam
+Carlo Maria Cuoghi Barbagli
+CherryMonster222
 Csaba
 Mylou53
 danieluhrinyi
 Kasina Dheeraj
 Donno
-Evgeniy Khramov
+FC Stegerman
 Flav
 Franciszek Stefan
+Gael Caraballo
 Grzegorz
+gneiss15
+Hamustra Scans
 HowITsDone
 Izzy
+Jacek
 Jacopo Gennaro Esposito
-Jean Mareilles
 Jean-Baptiste
-人工知能
+Kung-chih
+Karvjorm
 krkk
 Laura Ferraz 
 Lucas da Costa
-bittin
 Manan Jhaveri
 Marco
+BRBsoup
+Mateo Gomez
 Mattia
 Md. Al-Amin
 Michael Gangolf
 3DN1M
+Minecraft boom
+Mobashir Raihan
 Moi Toi
 DivideEtImpera
 Nicolas
+Nosnahc
+pa4k
 pbeckmann
 Peer Beckmann
+Piotr Strebski
 Piotr Zet
 Quang Nguyen
 Ratnesh
@@ -144,30 +181,45 @@ Rohan Babbar
 Ronak Upadhyay
 Rose Liverman
 SKULD
+Salem Malus
 Samarth Asthan
+Shailendra Maurya
+SilverFS
 Simone Dotto
 Subhashish Anand
-TenTraicion
+Subhradeep Bera
+SziaTomi
+Mehedi Hasan
 Titas Pažereckas
-Tom Sawyer
+atakujonc
 Tony C
 Tymofii Lytvynenko
 Vancha March
+Waldemar Stoczkowski
 Yevgeny M
 Yusril A
+ahmed-awad26
 Avik Kundu
 diksha-2911
 gbonaspetti
+gittyboy-cell
 huang ivan
+liva
+lucafont2
 mtrmirez
 opsik
 polarhun
 pooyanazari
 psa-jforestier
 sergio
+080502
 Marcus
 techwebpd
+Truestorybaby 
 tygyh
 unstartdev
+wmilan 17
+يوسف لطفي
 luoyang3
+JaeBeom An
 JungHee Lee

app/src/main/res/raw/readme.md

@@ -2,6 +2,18 @@
 
 stocard_stores.csv was created by extracting /data/data/de.stocard/de.stocard.stocard/databases/stores on a rooted devices and running the following command over it:
 
-    sqlite3 -header -csv stores "select _id,name,barcodeFormat from stores" > stocard_stores.csv
+```
+sqlite3 -header -csv sync_db "select id,content from synced_resources where collection = '/loyalty-card-providers/'" > stocard_providers.csv
+while IFS= read -r line; do
+  if [ "$line" = "id,content" ]; then
+    echo "_id,name,barcodeFormat" > stocard_stores.csv
+  else
+    id="$(echo "$line" | cut -d ',' -f1)"
+    name="$(echo "$line" | cut -d ',' -f2- | sed 's/""/"/g' | sed 's/^"//g' | sed 's/"$//g' | jq -r .name)"
+    barcodeFormat="$(echo "$line" | cut -d ',' -f2- | sed 's/""/"/g' | sed 's/^"//g' | sed 's/"$//g' | jq -r .default_barcode_format)"
+    echo "$id,\"$name\",$barcodeFormat" >> stocard_stores.csv
+  fi
+done < stocard_providers.csv
+```
 
 Only used for data portability reasons (ensuring importing works). Do NOT copy this anywhere else or use it for any purpose other than ensuring we can import a GDPR-provided export. We want to make sure this stays under fair use.

app/src/main/res/values-ar/strings.xml

@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_search">بحث</string>
     <string name="action_add">اضف</string>
-    <string name="noGiftCards">اضغط علي زر + لاضافة بطاقة, او استورد بعض منهم من قائمة ال ⋮.</string>
-    <string name="noMatchingGiftCards">لا يوجد نتائج. حاول تغيير كلمات البحث.</string>
+    <string name="noGiftCards">اضغط على + الزر الإضافي لاضافة بطاقة, او استورد من ⋮ القائمة.</string>
+    <string name="noMatchingGiftCards">لا نتائج. حاول تغيير كلمات البحث.</string>
     <string name="storeName">اسم</string>
     <string name="note">مذكرة</string>
     <string name="cardId">بطاقة شخصية</string>
@@ -12,17 +12,17 @@
     <string name="noBarcode">لا يوجد باركود</string>
     <string name="star">اضف الي المفضلة</string>
     <string name="unstar">حذف من المفضلة</string>
-    <string name="cancel">الغاء</string>
+    <string name="cancel">إلغاء</string>
     <string name="save">حفظ</string>
     <string name="edit">تعديل</string>
     <string name="delete">مسح</string>
     <string name="confirm">تأكيد</string>
     <string name="deleteConfirmation">مسح هذة البطاقة نهائيا؟</string>
     <string name="ok">حسنا</string>
-    <string name="copy_to_clipboard">نسخ البطاقة الشخصية الي الحافظة</string>
+    <string name="copy_to_clipboard">نسخ البطاقة الشخصية الى الحافظة</string>
     <string name="share">شارك</string>
     <string name="sendLabel">ارسل…</string>
-    <string name="editCardTitle">عدل بطاقة</string>
+    <string name="editCardTitle">عدل البطاقة</string>
     <string name="addCardTitle">اضف بطاقة</string>
     <string name="scanCardBarcode">مسح باركود</string>
     <string name="cardShortcut">اختصار البطاقة</string>
@@ -31,15 +31,14 @@
     <string name="barcodeImageDescriptionWithType">صورة <xliff:g>%s</xliff:g> باركود</string>
     <string name="noStoreError">لا يوجد اسم مدخل</string>
     <string name="noCardIdError">لا يوجد بطاقة شخصية مدخلة</string>
-    <string name="noCardExistsError">لا يمكن العثور علي هذه البطاقة</string>
+    <string name="noCardExistsError">لا يمكن العثور على هذه البطاقة</string>
     <string name="failedParsingImportUriError">لا يمكن تحليل الرابط المستورد</string>
     <string name="importExport">استيراد/تصدير</string>
-    <string name="importExportHelp">عمل نسخ احتطياتي لبياناتك يسمح نقلها لجهاز اخر.</string>
-    <string name="importFailed">لا يمكن عمل الاستيراد</string>
+    <string name="importExportHelp">دعم بياناتك يسمح بنقلها إلى جهاز آخر.</string>
+    <string name="importFailed">تعذر إجراء الاستيراد</string>
     <string name="exportSuccessfulTitle">متصدر</string>
     <string name="exportFailedTitle">فشل التصدير</string>
     <string name="exportFailed">لا يمكن عمل التصدير</string>
-    <string name="noExternalStoragePermissionError">امنح التخزين الخارجي اذن لاستيراد وتصدير البيانات</string>
     <string name="exportOptionExplanation">ستتم كتابة البيانات في الموقع الذي تختاره.</string>
     <string name="importOptionFilesystemButton">من نظام الملفات</string>
     <string name="importOptionApplicationTitle">استخدم تطبيقًا آخر</string>
@@ -49,7 +48,6 @@
     <string name="app_copyright_old">بناء على Loyalty Card Keychain
 \nحقوق النشر © 2016-2020 Branden Archer</string>
     <string name="app_license">البرمجيات الحرة متروكة الحقوق, ترخيص +GPLv3</string>
-    <string name="app_revision_fmt">معلومات المراجعة: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_libraries">مكتبات الطرف الثالث الحرة: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">اختار الباركود</string>
     <string name="enterBarcodeInstructions">أدخل بطاقة هوية ، واختر نوع الباركود أدناه ، أو \"لا يوجد باركود\".</string>
@@ -64,7 +62,6 @@
     <string name="settings_portrait_orientation">الوضع الرأسي</string>
     <string name="settings_landscape_orientation">الوضع الأفقي</string>
     <string name="settings_theme">مظهر</string>
-    <string name="settings_max_font_size_scale">اقصي. حجم الخط</string>
     <string name="settings_display_barcode_max_brightness">عرض مشرق علي الباركود</string>
     <string name="importSuccessful">تم استيراد البيانات</string>
     <string name="exportSuccessful">تم تصدير البيانات</string>
@@ -85,7 +82,7 @@
     <string name="points">نقاط</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> لا يبدو أنه رصيد صالح.</string>
     <string name="chooseImportType">استيراد البيانات من</string>
-    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="app_loyalty_card_keychain">سلسلة مفاتيح بطاقة الولاء</string>
     <string name="privacy_policy">سياسة الخصوصية</string>
     <string name="accept">قبول</string>
     <string name="importCatima">الاستيراد من Catima</string>
@@ -94,7 +91,7 @@
     <string name="importFidme">الاستيراد من FidMe</string>
     <string name="importFidmeMessage">حدد ملفك <i>fidme-export-request-xxxxxx.zip</i> تصدير من FidMe للاستيراد ، ثم حدد أنواع الباركود يدويًا بعد ذلك.
 \nقم بإنشائه من ملف تعريف FidMe الخاص بك عن طريق اختيار حماية البيانات ثم الضغط على استخراج بياناتي أولاً.</string>
-    <string name="importStocardMessage">حدد ملفك <i>***-sync.zip</i> تصدير من Stocard للاستيراد.
+    <string name="importStocardMessage">حدد ملفك <i>***.zip</i> تصدير من Stocard للاستيراد.
 \nاحصل عليه عن طريق إرسال بريد إلكتروني إلى support@stocardapp.com لطلب تصدير بياناتك.</string>
     <string name="importVoucherVault">الاستيراد من Voucher Vault</string>
     <string name="importVoucherVaultMessage">حدد ملفك <i>vouchervault.json</i> تصدير من Voucher Vault للاستيراد.
@@ -137,9 +134,6 @@
     <string name="app_contributors">أصبح ممكنًا بواسطة: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">فرز</string>
     <string name="showMoreInfo">اظهر المعلومات</string>
-    <string name="hideMoreInfo">إخفاء المعلومات</string>
-    <string name="swipeToSwitchImages">اسحب أو اضغط لفترة طويلة لتبديل الصور</string>
-    <string name="sort_by_balance">الرصيد</string>
     <string name="reverse">... بترتيب معكوس</string>
     <string name="sort_by">صنف حسب</string>
     <string name="settings_oled_dark">خلفية سوداء نقية لمظهر داكن</string>
@@ -151,7 +145,6 @@
     <string name="shortcutSelectCard">اختر بطاقة</string>
     <string name="options">خيارات</string>
     <string name="starred">مميز بنجمة</string>
-    <string name="set_scale">ضبط النطاق</string>
     <string name="include_if_asking_support">إذا كنت ترغب في طلب الدعم ، فقم بتضمين المعلومات التالية:</string>
     <string name="duplicateCard">كرر</string>
     <string name="archive">ضع الي الأرشيف</string>
@@ -160,7 +153,7 @@
     <string name="unarchived">البطاقة غير مؤرشفة</string>
     <string name="archiveList">أرشيف</string>
     <string name="failedLaunchingPhotoPicker">تعذر العثور على تطبيق معرض مدعوم</string>
-    <string name="noGiftCardsGroup">انشئ بعض من البطاقات, و عيينهم لهذة المجموعة.</string>
+    <string name="noGiftCardsGroup">انشئ بعض من البطاقات, و عيينهم لهذه المجموعة.</string>
     <string name="deleteTitle">مسح بطاقة</string>
     <plurals name="selectedCardCount">
         <item quantity="zero"><xliff:g>%d</xliff:g> محدد</item>
@@ -174,7 +167,7 @@
     <string name="exportName">تصدير</string>
     <string name="exporting">جار التصدير…</string>
     <string name="importSuccessfulTitle">مستورد</string>
-    <string name="importFailedTitle">فشل الاستيراد</string>
+    <string name="importFailedTitle">فشل بالاستيراد</string>
     <string name="sort_by_most_recently_used">الأكثر أستعمالا مؤخرا</string>
     <string name="license">رخصة</string>
     <string name="sort_by_name">اسم</string>
@@ -191,18 +184,18 @@
     <plurals name="deleteCardsTitle">
         <item quantity="zero">مسح <xliff:g>%d</xliff:g> بطاقة</item>
         <item quantity="one">مسح <xliff:g>%d</xliff:g> بطاقة</item>
-        <item quantity="two">مسح <xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="two">مسح <xliff:g>%d</xliff:g> بطاقتين</item>
         <item quantity="few">مسح <xliff:g>%d</xliff:g> بطاقات</item>
         <item quantity="many">مسح <xliff:g>%d</xliff:g> بطاقات</item>
         <item quantity="other">مسح <xliff:g>%d</xliff:g> بطاقات</item>
     </plurals>
     <plurals name="deleteCardsConfirmation">
-        <item quantity="zero">مسح هذه <xliff:g>%d</xliff:g> بطاقة نهائيا؟</item>
-        <item quantity="one">مسح هذه <xliff:g>%d</xliff:g> بطاقة نهائيا؟</item>
-        <item quantity="two">مسح هذه <xliff:g>%d</xliff:g> بطاقة نهائيا؟</item>
-        <item quantity="few">مسح هذه <xliff:g>%d</xliff:g> بطاقات نهائيا؟</item>
-        <item quantity="many">مسح هذه <xliff:g>%d</xliff:g> بطاقات نهائيا؟</item>
-        <item quantity="other">مسح هذه <xliff:g>%d</xliff:g> بطاقات نهائيا؟</item>
+        <item quantity="zero">مسح هذه <xliff:g>%d</xliff:g> البطاقة نهائيا؟</item>
+        <item quantity="one">مسح هذه <xliff:g>%d</xliff:g> البطاقة نهائيا؟</item>
+        <item quantity="two">مسح هذه <xliff:g>%d</xliff:g> البطاقتين نهائيا؟</item>
+        <item quantity="few">مسح هذه <xliff:g>%d</xliff:g> البطاقات نهائيا؟</item>
+        <item quantity="many">مسح هذه <xliff:g>%d</xliff:g> البطاقات نهائيا؟</item>
+        <item quantity="other">مسح هذه <xliff:g>%d</xliff:g> البطاقات نهائيا؟</item>
     </plurals>
     <string name="importOptionFilesystemTitle">الاستيراد من نظام الملفات</string>
     <string name="importOptionFilesystemExplanation">اختر ملفًا محددًا من نظام الملفات.</string>
@@ -213,7 +206,6 @@
     <string name="app_resources">موارد الطرف الثالث الحرة: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="settings_follow_system_orientation">نظام المتابعة</string>
     <string name="groups">مجموعات</string>
-    <string name="barcode">باركود</string>
     <string name="settings_keep_screen_on">حافظ على الشاشة قيد التشغيل</string>
     <string name="intent_import_card_from_url_share_text">اريد مشاركة بطاقة معك</string>
     <string name="groupsList">مجموعات: <xliff:g>%s</xliff:g></string>
@@ -235,7 +227,6 @@
     <string name="balanceSentence">الرصيد: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">تنتهي: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">منتهي الصلاحية: <xliff:g>%s</xliff:g></string>
-    <string name="moveBarcodeToCenterOfScreen">قم بتوسيط الرمز الشريطي على الشاشة</string>
     <plurals name="balancePoints">
         <item quantity="zero"><xliff:g>%s</xliff:g> نقطة</item>
         <item quantity="one"><xliff:g>%s</xliff:g> نقطة</item>
@@ -275,4 +266,27 @@
     <string name="barcodeLongPressMessage">يمكن فتح صور فقط في تطبيق معرض الصور</string>
     <string name="failedToOpenUrl">ثبت متصفح ويب أولاً</string>
     <string name="welcome">مرحبا بك في كاتيما</string>
+    <string name="updateBalanceTitle">كم أنفقت؟</string>
+    <string name="currentBalanceSentence">الرصيد الحالي: <xliff:g> %s </xliff:g></string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="zero">عرض الأرشيف (<xliff:g>%1$d</xliff:g> بطاقة)</item>
+        <item quantity="one">عرض الأرشيف (<xliff:g>%1$d</xliff:g> بطاقة)</item>
+        <item quantity="two">عرض الأرشيف (<xliff:g>%1$d</xliff:g> بطاقتين)</item>
+        <item quantity="few">عرض الأرشيف (<xliff:g>%1$d</xliff:g> بطاقات)</item>
+        <item quantity="many">عرض الأرشيف (<xliff:g>%1$d</xliff:g> بطاقات)</item>
+        <item quantity="other">عرض الأرشيف (<xliff:g>%1$d</xliff:g> بطاقات)</item>
+    </plurals>
+    <string name="importCards">استيراد البطاقات</string>
+    <string name="newBalanceSentence">الرصيد الجديد: <xliff:g>%s</xliff:g></string>
+    <string name="cameraPermissionDeniedTitle">تعذر الوصول إلى الكاميرا</string>
+    <string name="noCameraPermissionDirectToSystemSetting">لمسح الباركود، ستحتاج Catima إلى الوصول إلى الكاميرا. اضغط هنا لتغيير إعدادات الأذونات.</string>
+    <string name="updateBalance">تحديث الرصيد</string>
+    <string name="updateBalanceHint">أدخل المبلغ</string>
+    <string name="storageReadPermissionRequired">الصلاحيه للوصل للتخزين مطلوبة لهذا الاجراء</string>
+    <string name="validFromDate">عربيه</string>
+    <string name="cameraPermissionRequired">إذن للوصول إلى الكاميرا اللازمة لهذا الإجراء…</string>
+    <string name="anyDate">أي تاريخ</string>
+    <string name="chooseValidFromDate">اختر صالح من التاريخ</string>
+    <string name="validFromSentence">صالح من:<xliff:g>%s</xliff:g></string>
+    <string name="height">الطول:</string>
 </resources>

app/src/main/res/values-ast/strings.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+    <string name="storeName">Nome</string>
+    <string name="note">Nota</string>
+    <string name="noMatchingGiftCards">Nun hai nengún resultáu. Prueba a camudar la busca.</string>
+    <string name="barcodeType">Tipu de códigu de barres</string>
+    <string name="noBarcode">Ensin códigu de barres</string>
+    <string name="star">Meter en Favoritos</string>
+    <string name="confirm">Confirmar</string>
+    <string name="deleteConfirmation">¿Quies desaniciar esta tarxeta permanentemente\?</string>
+    <string name="importExport">Importar/Esportar</string>
+    <string name="noCardIdError">Nun s\'introduxo nenguna ID</string>
+    <string name="exportFailed">Num se pudo facer la esportación</string>
+    <string name="importFailedTitle">La importación falló</string>
+    <string name="exportOptionExplanation">Los datos escríbense nel llugar qu\'escueyas.</string>
+    <string name="app_license">Software llibre llicenciao cola GPLv3+</string>
+    <string name="action_search">Buscar</string>
+    <string name="action_add">Amestar</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> na seleición</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> na seleición</item>
+    </plurals>
+    <string name="noGiftCards">Calca\'l botón «+» p\'amestar una tarxeta o impórtales dende\'l menú «⋮».</string>
+    <string name="cardId">ID</string>
+    <string name="barcodeNoBarcode">Nun hai nengún códigu de barres</string>
+    <string name="save">Guardar</string>
+    <string name="edit">Editar</string>
+    <string name="delete">Desaniciar</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one"></item>
+        <item quantity="other"></item>
+    </plurals>
+    <string name="unstar">Quitar de Favoritos</string>
+    <string name="cancel">Encaboxar</string>
+    <string name="importFailed">Nun se pudo facer la importación</string>
+    <string name="noCardExistsError">Nun se pudo atopar esa tarxeta</string>
+    <string name="all">Too</string>
+    <string name="noStoreError">Nun s\'introduxo nengún nome</string>
+    <string name="sendLabel">Unviar…</string>
+    <string name="editCardTitle">Editar la tarxeta</string>
+    <string name="ok">D\'acuerdu</string>
+    <string name="exportFailedTitle">La esportación falló</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Pa escaniar códigos de barres, Catima tien d\'acceder a la cámara. Toca equí pa camudar la configuración de los permisos.</string>
+    <string name="debug_version_fmt">Versión: <xliff:g id="version">%s</xliff:g></string>
+    <string name="importing">Importando…</string>
+    <string name="exporting">Esportando…</string>
+    <string name="storageReadPermissionRequired">Esta aición precisa\'l permisu pa lleer l\'almacenamientu…</string>
+    <string name="cameraPermissionRequired">Esta aición precisa l\'accesu a la cámara…</string>
+    <string name="cameraPermissionDeniedTitle">Nun se pudo acceder a la cámara</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_copyright_old">Básase en Loyalty Card Keychain
+\ncopyright © 2016–2020 Branden Archer</string>
+    <string name="thumbnailDescription">Miniatura</string>
+    <string name="settings">Configuración</string>
+    <string name="settings_theme">Estilu</string>
+</resources>

app/src/main/res/values-bg/strings.xml

@@ -34,7 +34,6 @@
     <string name="setFrontImage">Снимка на предната страна</string>
     <string name="photos">Снимки</string>
     <string name="importOptionApplicationExplanation">Изберете файл на друго приложение.</string>
-    <string name="noExternalStoragePermissionError">Разрешете достъп до хранилището, за да работи внасянето и изнасянето</string>
     <string name="noCardExistsError">Картата не е намерена</string>
     <string name="updateBarcodeQuestionText">Идентификаторът е променен. Желаете ли с неговата стойност да бъде променен и щрихкодът\?</string>
     <string name="updateBarcodeQuestionTitle">Обновяване на щрихкода\?</string>
@@ -69,16 +68,14 @@
     <string name="balance">Наличност</string>
     <string name="errorReadingImage">Изображението е нечетимо</string>
     <string name="noBarcodeFound">Не е намерен щрихкод</string>
-    <string name="moveBarcodeToCenterOfScreen">Премества щрихкода в центъра на екрана</string>
     <string name="moveBarcodeToTopOfScreen">Премества щрихкода най-горе на екрана</string>
     <string name="never">Не изтича</string>
-    <string name="chooseExpiryDate">Дата на изтичане</string>
-    <string name="expiryDate">Валидност</string>
+    <string name="chooseExpiryDate">Определена дата</string>
+    <string name="expiryDate">Валидна до</string>
     <string name="editBarcode">Редактиране на щрихкод</string>
-    <string name="barcode">Щрихкод</string>
     <string name="card">Карта</string>
     <string name="groupsList">Списъци: <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentence">Валидност: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Валидна до: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Изтекла: <xliff:g>%s</xliff:g></string>
     <string name="balanceSentence">Наличност: <xliff:g>%s</xliff:g></string>
     <string name="noGroups">Докоснете бутона +, за да добавите списък.</string>
@@ -86,10 +83,9 @@
     <string name="groups">Списъци</string>
     <string name="enter_group_name">Въведете име на списъка</string>
     <string name="intent_import_card_from_url_share_text">Искам да споделя тази карта с вас</string>
-    <string name="settings_display_barcode_max_brightness">Увеличаване на яркостта при видим щрихкод</string>
-    <string name="settings_keep_screen_on">Поддържане на екрана включен</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Предотвратяване на заключване на екрана</string>
-    <string name="settings_max_font_size_scale">Максимален размер на шрифта</string>
+    <string name="settings_display_barcode_max_brightness">Максимална яркост при видим щрихкод</string>
+    <string name="settings_keep_screen_on">Без изключване на екрана</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Без заключване на екрана</string>
     <string name="settings_dark_theme">Тъмна</string>
     <string name="settings_light_theme">Светла</string>
     <string name="settings_system_theme">Системна</string>
@@ -128,7 +124,6 @@
     <string name="importOptionFilesystemExplanation">Изберете определен файл от файловата система.</string>
     <string name="app_resources">Свободни ресурси: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Свободни библиотеки: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_revision_fmt">Компилация: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="debug_version_fmt">Издание: <xliff:g id="version">%s</xliff:g></string>
     <string name="about_title_fmt">Относно <xliff:g id="app_name">%s</xliff:g></string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Всички права запазени © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
@@ -153,7 +148,7 @@
     <string name="importVoucherVault">Внасяне от Voucher Vault</string>
     <string name="importVoucherVaultMessage">Изберете файла <i>vouchervault.json</i>, предварително изнесен от Voucher Vault.
 \nСъздайте такъв файл от меню „Export“ във Voucher Vault.</string>
-    <string name="importStocardMessage">Изберете файла <i>***-sync.zip</i>, предварително изнесен от Stocard.
+    <string name="importStocardMessage">Изберете файла <i>***.zip</i>, предварително изнесен от Stocard.
 \nПолучете го като изпратите писмо на support@stocardapp.com с искане за изнасяне вашите данни.</string>
     <string name="importLoyaltyCardKeychainMessage">Изберете файла <i>LoyaltyCardKeychain.csv</i>, предварително изнесен от Loyalty Card Keychain.
 \nСъздайте такъв файл от меню Внасяне/изнасяне от друго устройство с Loyalty Card Keychain като изберете Изнасяне.</string>
@@ -184,10 +179,8 @@
     <string name="settings_locale">Език</string>
     <string name="noGroupCards">Групата е празна</string>
     <string name="barcodeImageDescriptionWithType">Изображение на щрихкод от вид <xliff:g>%s</xliff:g></string>
-    <string name="swipeToSwitchImages">За да размените изображенията - плъзнете, а за да ги отворите в галерията - задръжте</string>
     <string name="sort_by">Сортиране по</string>
     <string name="reverse">…в обратен ред</string>
-    <string name="sort_by_balance">Наличност</string>
     <string name="sort_by_expiry">Валидност</string>
     <string name="sort_by_most_recently_used">Последно използване</string>
     <string name="sort_by_name">Наименование</string>
@@ -203,8 +196,8 @@
     <string name="and_data_usage">и използване на данни</string>
     <string name="help_translate_this_app">Помогнете за превода на приложението</string>
     <string name="exportPasswordHint">Въведете парола</string>
-    <string name="exportPassword">Задаване на парола за защита на изнесеното (по избор)</string>
-    <string name="setIcon">Задаване на пиктограма</string>
+    <string name="exportPassword">Защитете архива с парола (по желание)</string>
+    <string name="setIcon">Задаване на значка</string>
     <string name="editGroup">Променяне на списъка: <xliff:g>%s</xliff:g></string>
     <string name="group_name_already_in_use">Има списък с това име</string>
     <string name="group_updated">Промените са запазени</string>
@@ -217,22 +210,20 @@
     <string name="translate_platform">в Weblate</string>
     <string name="shortcutSelectCard">Избор на карта</string>
     <string name="starred">Със звезда</string>
-    <string name="set_scale">Мащаб</string>
     <string name="showMoreInfo">Показване на информация</string>
-    <string name="hideMoreInfo">Скриване на информация</string>
     <string name="options">Настройки</string>
     <string name="card_ids_copied">Идентификаторите са копирани</string>
     <plurals name="balancePoints">
         <item quantity="one"><xliff:g>%s</xliff:g> точка</item>
         <item quantity="other"><xliff:g>%s</xliff:g> точки</item>
     </plurals>
-    <string name="settings_oled_dark">Чисто черен фон за тъмната тема</string>
+    <string name="settings_oled_dark">Черен фон за тъмната тема</string>
     <string name="include_if_asking_support">Ако искате да потърсите поддръжка, включете следната информация:</string>
-    <string name="settings_card_orientation">Положение на щрихкода</string>
+    <string name="settings_card_orientation">Завъртане на щрихкода</string>
     <string name="settings_follow_system_orientation">Според системата</string>
-    <string name="settings_portrait_orientation">Портретно</string>
-    <string name="settings_landscape_orientation">Пейзажно</string>
-    <string name="settings_lock_on_opening_orientation">Използване на положението, използвано при отваряне на картата</string>
+    <string name="settings_portrait_orientation">Портрет</string>
+    <string name="settings_landscape_orientation">Пейзаж</string>
+    <string name="settings_lock_on_opening_orientation">Като при отваряне на картата</string>
     <string name="duplicateCard">Дублиране</string>
     <string name="archive">Архивиране</string>
     <string name="unarchive">Изваждане от архива</string>
@@ -263,4 +254,19 @@
     <string name="currentBalanceSentence">Текущ баланс: <xliff:g>%s</xliff:g></string>
     <string name="updateBalance">Обновяване на баланса</string>
     <string name="importCards">Внасяне на карти</string>
+    <string name="storageReadPermissionRequired">За това действие е необходимо разрешение за четене на хранилището…</string>
+    <string name="cameraPermissionRequired">За това действие е необходимо разрешение за достъп до камерата…</string>
+    <string name="validFromDate">Валидна от</string>
+    <string name="anyDate">Без значение от датата</string>
+    <string name="validFromSentence">Валидна от: <xliff:g>%s</xliff:g></string>
+    <string name="chooseValidFromDate">Определена дата</string>
+    <string name="height">Височина:</string>
+    <string name="switchToFrontImage">Показване на предната страна</string>
+    <string name="switchToBackImage">Показване на задната страна</string>
+    <string name="switchToBarcode">Показване на щрихкода</string>
+    <string name="openFrontImageInGalleryApp">Отваряне на изображението на предната страна в приложението галерия</string>
+    <string name="openBackImageInGalleryApp">Отваряне на изображението на задната страна в приложението галерия</string>
+    <string name="setBarcodeHeight">Задаване на височина на щрихкода</string>
+    <string name="donate">Даряване</string>
+    <string name="icon_header_click_text">Задръжте, за да промените значката</string>
 </resources>

app/src/main/res/values-bn-rIN/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="save">সংরক্ষণ</string>
     <string name="cancel">বাতিল</string>
     <string name="unstar">তারা মুক্ত</string>
@@ -8,20 +8,19 @@
     <string name="barcodeType">বারকোড ধরন</string>
     <string name="note">বিঃদ্রঃ</string>
     <string name="storeName">দোকানের নাম</string>
-    <string name="noMatchingGiftCards">কোন ম্যাচিং উপহার কার্ড নেই</string>
-    <string name="noGiftCards">উপহার কার্ড নেই</string>
+    <string name="noMatchingGiftCards">কোনো ফলাফল পাওয়া যায়নি। অনুসন্ধানের বাক্যটি বদলে দেখুন।</string>
+    <string name="noGiftCards">প্লাস বোতামটি টিপে একটি কার্ড যোগ করুন বা ⋮ মেনু থেকে কিছু নিয়ে আসুন।</string>
     <string name="action_add">কর্ম যোগ</string>
     <string name="all">সব</string>
-    <string name="noGroupCards">গোষ্ঠী কার্ড নেই</string>
-    <string name="noGroups">গোষ্ঠীগুলি নেই</string>
+    <string name="noGroupCards">এই গ্রুপটি খালি</string>
+    <string name="noGroups">+ যোগ বোতামটি টিপে গ্রুপ যোগ করুন যাতে তাদের শ্রেণীকরণ করা যায়।</string>
     <string name="groups">গোষ্ঠীগুলি</string>
     <string name="enter_group_name">গোষ্ঠী নাম লিখুন </string>
-    <string name="exportSuccessful">রপ্তানি সফল</string>
-    <string name="importSuccessful">আগম সফল</string>
+    <string name="exportSuccessful">তথ্য রপ্তানি করা শেষ</string>
+    <string name="importSuccessful">তথ্য আনা শেষ</string>
     <string name="intent_import_card_from_url_share_text">url শেয়ার টেক্সট থেকে ইন্টেন্ট ইম্পোর্ট কার্ড</string>
-    <string name="settings_disable_lockscreen_while_viewing_card"> কার্ড দেখা কালিন লকস্ক্রিন নিষ্ক্রিয়</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">স্ক্রীন লক হতে দেবেন না</string>
     <string name="settings_keep_screen_on">সেটিংস পর্দা খোলা রাখুন</string>
-    <string name="settings_max_font_size_scale">সর্বোচ্চ হরফ আকার</string>
     <string name="settings_light_theme">সাদাটে থিম</string>
     <string name="settings_system_theme">যন্ত্রর থিম</string>
     <string name="settings_theme">থিম</string>
@@ -32,11 +31,11 @@
     <string name="importStocard">স্টো কার্ড আমদানি করুন</string>
     <string name="importVoucherVault">আমদানি ভাউচার ভল্ট</string>
     <string name="barcodeId">বারকোড আইডি</string>
-    <string name="sameAsCardId">কার্ড আইডির মতো</string>
+    <string name="sameAsCardId">আইডি আর এটা এক</string>
     <string name="setBarcodeId">বারকোড আইডি সেট করুন</string>
-    <string name="unsupportedBarcodeType">অসমর্থিত বারকোড টাইপ</string>
+    <string name="unsupportedBarcodeType">এই বারকোডের টাইপটি এখন দেখানো যাচ্ছে না। অ্যাপের পরের সংস্করণে হয়ত এটি সমর্থন করা যেতে পারে।</string>
     <string name="wrongValueForBarcodeType">বারকোড টাইপের জন্য ভুল মান</string>
-    <string name="copy_to_clipboard_multiple_toast">ক্লিপবোর্ড একাধিক টোস্টে অনুলিপি করুন</string>
+    <string name="copy_to_clipboard_multiple_toast">আইডিগুলি ক্লিপবোর্ডে কপি হল</string>
     <string name="intent_import_card_from_url_share_multiple_text">url থেকে ইন্টেন্ট ইম্পোর্ট কার্ড একাধিক টেক্সট শেয়ার করে</string>
     <string name="frontImageDescription">সামনের চিত্র</string>
     <string name="backImageDescription">পিছনের চিত্র</string>
@@ -45,12 +44,12 @@
     <string name="setBackImage">পিছনের ছবি স্থাপন</string>
     <string name="removeImage">ছবি অপসারণ</string>
     <string name="takePhoto">ছবি নেত্তয়া</string>
-    <string name="updateBarcodeQuestionTitle">হালনাগাদ বারকোড প্রশ্ন শিরোনাম</string>
-    <string name="updateBarcodeQuestionText">হালনাগাদ বারকোড প্রশ্ন টেক্সট </string>
+    <string name="updateBarcodeQuestionTitle">বারকোডের মানটি আপডেট করবেন\?</string>
+    <string name="updateBarcodeQuestionText">আপনি আইডিটি পাল্টেছেন, এটির কোনো বারকোড দিয়ে কি এখনের বারকোডটি আপডেট করে দেবেন\?</string>
     <string name="yes">হাঁ</string>
     <string name="no">না</string>
     <string name="passwordRequired">পাসওয়ার্ড প্রয়োজন</string>
-    <string name="failedGeneratingShareURL">শেয়ার ইউআরএল তৈরি করতে ব্যর্থ হয়েছে</string>
+    <string name="failedGeneratingShareURL">শেয়ার করার ইউআরএল তৈরি করা গেল না। অনুগ্রহ করে এটিকে রিপোর্ট করে দিন।</string>
     <string name="turn_flashlight_on">টর্চলাইট চালু করুন</string>
     <string name="turn_flashlight_off">টর্চলাইট বন্ধ করুন</string>
     <string name="settings_locale">লোকেল</string>
@@ -65,11 +64,10 @@
     <string name="settings_green_theme">সবুজ থিম</string>
     <string name="settings_brown_theme">বাদামী থিম</string>
     <string name="sort">সাজান</string>
-    <string name="swipeToSwitchImages">ছবি পরিবর্তন করতে সোয়াইপ করুন</string>
     <string name="sort_by_name">নামের দ্বারা সাজান</string>
     <string name="sort_by_most_recently_used">সর্বাধিক সম্প্রতি ব্যবহৃত দ্বারা সাজান</string>
     <string name="sort_by_expiry">মেয়াদ শেষ করে সাজান</string>
-    <string name="reverse">বিপরীত</string>
+    <string name="reverse">...উল্টো ক্রমে</string>
     <string name="sort_by">ক্রমানুসার</string>
     <string name="noCardExistsError">কার্ডটি পাওয়া যায়নি</string>
     <string name="noStoreError">স্টোরেজ ত্রুটি নেই</string>
@@ -80,7 +78,7 @@
     <string name="sendLabel">পাঠান…</string>
     <string name="share">ভাগ</string>
     <string name="copy_to_clipboard">নকল করুন ক্লিপবোর্ড এ</string>
-    <string name="deleteConfirmation">নিশ্চিতকরণ মুছে দিন</string>
+    <string name="deleteConfirmation">এই কার্ডটি চিরকালের জন্য মুছে দেবো\?</string>
     <string name="confirm">নিশ্চিত করুন</string>
     <string name="delete">মুছে ফেলুন</string>
     <string name="edit">সম্পাদনা</string>
@@ -92,13 +90,174 @@
     <string name="deleteTitle">কার্ড ডিলিট করুন</string>
     <string name="ok">ঠিক আছে</string>
     <string name="about">সম্পর্কিত</string>
-    <string name="debug_version_fmt">সংস্করণ:
-\n<xliff:g id="version">
-\n%s</xliff:g></string>
+    <string name="debug_version_fmt">সংস্করণ: <xliff:g id="version">%s</xliff:g></string>
     <string name="importOptionApplicationButton">অন্য অ্যাপ ব্যাবহার করুন</string>
     <string name="moveUp">উপরে উঠান</string>
     <string name="moveDown">নিচে নামান</string>
-    <string name="barcode">বারকোড</string>
     <string name="expiryDate">মেয়াদোত্তীর্ণ তারিখ</string>
     <string name="noBarcodeFound">কোনো বারকোড পাওয়া যায়নি</string>
+    <string name="cameraPermissionRequired">এই কাজটির জন্য ক্যামেরা ব্যবহার করার অনুমতি লাগবে…</string>
+    <string name="noCameraPermissionDirectToSystemSetting">বারকোড স্ক্যান করার জন্য, কাটিমাকে ফোনের ক্যামেরা ব্যবহার করার অনুমতি দিতে হবে। এইখানে টাচ করে আপনার অনুমতি সেটিংস পালটে নিন।</string>
+    <string name="importOptionApplicationExplanation">আপনার প্রিয় ফাইল ম্যানেজার বা আর যেকোনো অ্যাপ দিয়ে একটি ফাইল খুলুন।</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">মেধাস্বত্ব © ২০১৯-<xliff:g>%d</xliff:g> সিলভিয়া ভান অস</string>
+    <string name="app_license">কপিলেফ্ট করা মুক্ত সফটওয়্যার, জিপিএলের ৩য় এবং তার অধিক সংস্করণে লাইসেন্স করা</string>
+    <string name="enterBarcodeInstructions">আইডিটি লিখুন আর নয় নিচ থেকে একটি বারকোডের প্রকার বা \"কোনো বারকোড নেই\", নির্বাচন করুন।</string>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">এই <xliff:g>%d</xliff:g>টি কার্ড কি চিরকালের জন্য মুছে দেবো\?</item>
+        <item quantity="other">এই <xliff:g>%d</xliff:g>টি কার্ড কি চিরকালের জন্য মুছে দেবো\?</item>
+    </plurals>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> একটি নির্বাচিত</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> টি নির্বাচিত</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one"><xliff:g>%d</xliff:g>টি কার্ড মুছে ফেলুন</item>
+        <item quantity="other"><xliff:g>%d</xliff:g>টি কার্ড মুছে ফেলুন</item>
+    </plurals>
+    <string name="cameraPermissionDeniedTitle">ফোনের ক্যামেরা ব্যবহার করা যাচ্ছে না</string>
+    <string name="importOptionFilesystemExplanation">ফোনের স্টোরেজ থেকে নির্দিষ্ট একটি ফাইল আনুন।</string>
+    <string name="app_libraries">মুক্ত লাইব্রেরি যেগুলি আমার নয়: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g>টির ব্যাপারে</string>
+    <string name="app_resources">মুক্ত সম্পদ যেগুলি আমার নয়: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="thumbnailDescription">থাম্বনেইল</string>
+    <string name="settings_card_orientation">বারকোড অভিমুখ</string>
+    <string name="settings_follow_system_orientation">সিস্টেমের অনুসারে</string>
+    <string name="settings_portrait_orientation">প্রতিকৃতি</string>
+    <string name="barcodeImageDescriptionWithType">ছবি <xliff:g>%s</xliff:g> বারকোড</string>
+    <string name="exportName">রপ্তানি</string>
+    <string name="failedParsingImportUriError">আমদানির ইউআরআই বোঝা যাচ্ছে না</string>
+    <string name="importExport">আমদানি/রপ্তানি</string>
+    <string name="cardShortcut">কার্ড শর্টকাট</string>
+    <string name="exportFailed">বার করা যাচ্ছে না</string>
+    <string name="copy_to_clipboard_toast">আইডি ক্লিপবোর্ডে নকল করা হল</string>
+    <string name="noCardIdError">কোনো আইডি দওয়া হয়নি</string>
+    <string name="importExportHelp">নিজের তথ্য অন্য কোথাও সংরক্ষণ করে রাখলে পরে সেটা অন্য ফোনে আবার নিয়ে নাওয়া যাই।</string>
+    <string name="importFailed">আনা যাচ্ছে না</string>
+    <string name="noGiftCardsGroup">কিছু কার্ড বানান আর এই গ্রুপে স্থির করুন।</string>
+    <string name="scanCardBarcode">বারকোড স্ক্যান করুন</string>
+    <string name="importSuccessfulTitle">আনা শেষ</string>
+    <string name="importFailedTitle">আনা ব্যর্থ</string>
+    <string name="exportSuccessfulTitle">বার করা শেষ</string>
+    <string name="exportFailedTitle">বার করা ব্যর্থ</string>
+    <string name="importing">আনা হচ্ছে…</string>
+    <string name="exporting">বার করা হচ্ছে…</string>
+    <string name="storageReadPermissionRequired">এই কাজটির জন্য ফোনের স্টোরেজ দেখার অনুমতি লাগবে…</string>
+    <string name="exportOptionExplanation">তথ্যটি আপনার পছন্দের জায়গায় রাখা হবে।</string>
+    <string name="importOptionFilesystemTitle">ফোনের স্টোরেজ থেকে আনুন</string>
+    <string name="importOptionFilesystemButton">ফোনের স্টোরেজ থেকে</string>
+    <string name="importOptionApplicationTitle">অন্য অ্যাপ ব্যবহার করুন</string>
+    <string name="app_copyright_old">লয়ালটি কার্ড কিচ্যেনের উপর ভিত্তি করে
+\nমেধাস্বত্ব © ২০১৬-২০২০ ব্রানডেন আর্চার</string>
+    <string name="selectBarcodeTitle">বারকোড নির্বাচন করুন</string>
+    <string name="settings">সেটিংস</string>
+    <string name="settings_dark_theme">অন্ধকার</string>
+    <string name="settings_landscape_orientation">অনুভূমিক</string>
+    <string name="settings_lock_on_opening_orientation">কার্ড খোলার সময় যে অভিমুখ থাকে সেটিতে লক করে দেবেন</string>
+    <string name="group_name_already_in_use">গ্রুপটির নাম আগে একবার ব্যবহার করে ফেলেছেন</string>
+    <string name="group_edit">গ্রুপ সম্পাদনা করুন</string>
+    <string name="group_updated">গ্রুপটি আপডেট করা হল</string>
+    <string name="group_name_is_empty">গ্রুপের একটি নাম থাকতে হবে</string>
+    <string name="deleteConfirmationGroup">গ্রুপটি মুছে দেবেন\?</string>
+    <string name="failedOpeningFileManager">প্রথমে একটি ফাইল ম্যানেজার ইনস্টল করুন।</string>
+    <string name="leaveWithoutSaveConfirmation">সংরক্ষণ না করেই চলে যাবেন\?</string>
+    <string name="addManually">নিজে হাতে আইডি লিখুন</string>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g>টি কার্ড</item>
+        <item quantity="other"><xliff:g>%d</xliff:g>টি কার্ড</item>
+    </plurals>
+    <string name="leaveWithoutSaveTitle">প্রস্থান</string>
+    <string name="settings_display_barcode_max_brightness">বারকোড উজ্জ্বল করুন</string>
+    <string name="editGroup">যেই গ্রুপ সম্পাদনা করা হচ্ছে: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">মেয়াদ শেষ হয়ে গিয়েছে: <xliff:g>%s</xliff:g></string>
+    <string name="editBarcode">বারকোড সম্পাদন করুন</string>
+    <string name="never">কখনই না</string>
+    <string name="addFromImage">গ্যালারি থেকে ছবি বাছুন</string>
+    <string name="groupsList">গ্রুপগুলি: <xliff:g>%s</xliff:g></string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> পয়েন্ট</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> পয়েন্ট</item>
+    </plurals>
+    <string name="expiryStateSentence">মেয়াদ শেষ হবে: <xliff:g>%s</xliff:g></string>
+    <string name="balanceSentence">ব্যালেন্স: <xliff:g>%s</xliff:g></string>
+    <string name="chooseExpiryDate">মেয়াদ শেষ হওয়ার তারিখ মনোনীত করুন</string>
+    <string name="moveBarcodeToTopOfScreen">বারকোডটি স্ক্রিনের উপরে উঠিয়ে দিন</string>
+    <string name="errorReadingImage">ছবিটি স্ক্যান করা যাচ্ছে না</string>
+    <string name="privacy_policy_popup_text">ব্যক্তিগত তথ্যের গোপনীয়তা নীতি নোটিশ (কিছু অ্যাপ স্টোরের এটি লাগে):
+\n
+\nকোন তথ্য একেবারেই সংগ্রহ করা হয় না, যা যে কেউ নিশ্চিত করতে পারবেন কারন আমাদের অ্যাপ মুক্ত সফটওয়্যার।</string>
+    <string name="balance">ব্যালান্স</string>
+    <string name="points">পয়েন্ট</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> কোনো বৈধ ব্যালান্স মনে হচ্ছে না।</string>
+    <string name="chooseImportType">এখান থেকে তথ্য আমদানি করুন</string>
+    <string name="app_loyalty_card_keychain">আনুগত্য কার্ড কীচেন</string>
+    <string name="privacy_policy">ব্যক্তিগত তথ্যের গোপনীয়তা নীতি</string>
+    <string name="accept">গ্রহণ</string>
+    <string name="failedToRetrieveImageFile">ছবি ফাইল পুনরুদ্ধার করতে ব্যর্থ হয়েছে</string>
+    <string name="on_github">GitHub -এ</string>
+    <string name="importLoyaltyCardKeychainMessage">আমদানি করতে লয়্যালটি কার্ড কীচেন থেকে আপনার <i>LoyaltyCardKeychain.csv</i> এক্সপোর্ট নির্বাচন করুন।
+\nলয়্যালটি কার্ড কীচেনের আমদানি/রপ্তানি মেনু থেকে প্রথমে সেখানে রপ্তানি টিপে এটি তৈরি করুন।</string>
+    <string name="selectColor">রঙ নির্বাচন করুন</string>
+    <string name="unarchived">কার্ড সংরক্ষণাগারমুক্ত করা হয়েছে</string>
+    <string name="archiveList">সংরক্ষণাগার</string>
+    <string name="report_error">ভুল প্রতিবেদন</string>
+    <string name="failedLaunchingPhotoPicker">একটি সমর্থিত গ্যালারি অ্যাপ খুঁজে পাওয়া যায়নি</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> card (<xliff:g id="archivedCount">%2$d</xliff:g> archived)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> cards (<xliff:g id="archivedCount">%2$d</xliff:g> archived)</item>
+    </plurals>
+    <string name="nextCard">পরবর্তী</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">সংরক্ষণাগার দেখুন (<xliff:g>%1$d</xliff:g> কার্ড)</item>
+        <item quantity="other">সংরক্ষণাগার দেখুন (<xliff:g>%1$d</xliff:g> কার্ডগুলি)</item>
+    </plurals>
+    <string name="failedToOpenUrl">প্রথমে একটি ওয়েব ব্রাউজার ইন্সটল করুন</string>
+    <string name="newBalanceSentence">নতুন ব্যালেন্স: <xliff:g>%s</xliff:g></string>
+    <string name="chooseValidFromDate">তারিখ থেকে বৈধ নির্বাচন করুন</string>
+    <string name="validFromSentence">এর থেকে বৈধ: <xliff:g>%s</xliff:g></string>
+    <string name="version_history">সংস্করণ ইতিহাস</string>
+    <string name="credits">ক্রেডিট</string>
+    <string name="help_translate_this_app">এই অ্যাপটি অনুবাদ করতে সাহায্য করুন</string>
+    <string name="showMoreInfo">তথ্য দেখান</string>
+    <string name="app_contributors">এর দ্বারা সম্ভব হয়েছে: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="importCards">কার্ড আমদানি করুন</string>
+    <string name="importFidmeMessage">FidMe থেকে আমদানি করতে আপনার <i>fidme-export-request-xxxxxx.zip</i> রপ্তানি নির্বাচন করুন এবং পরে বারকোডের ধরন ম্যানুয়ালি নির্বাচন করুন।
+\nআপনার FidMe প্রোফাইল থেকে ডেটা সুরক্ষা নির্বাচন করে এবং তারপর প্রথমে আমার ডেটা বের করুন টিপে এটি তৈরি করুন।</string>
+    <string name="importCatimaMessage">ক্যাটিমা থেকে আমদানি করতে আপনার <i>catima.zip</i> রপ্তানি নির্বাচন করুন।
+\nঅন্য Catima অ্যাপের আমদানি/রপ্তানি মেনু থেকে প্রথমে সেখানে রপ্তানি টিপে এটি তৈরি করুন।</string>
+    <string name="importStocardMessage">আমদানি করতে Stocard থেকে আপনার <i>***.zip</i> এক্সপোর্ট নির্বাচন করুন।
+\nআপনার ডেটা রপ্তানির জন্য জিজ্ঞাসা করে support@stocardapp.com ই-মেইল করে এটি পান।</string>
+    <string name="importVoucherVaultMessage">আমদানি করতে ভাউচার ভল্ট থেকে আপনার <i>vouchervault.json</i> এক্সপোর্ট নির্বাচন করুন।
+\nপ্রথমে ভাউচার ভল্টে এক্সপোর্ট টিপে এটি তৈরি করুন।</string>
+    <string name="settings_oled_dark">অন্ধকার থিমের জন্য খাঁটি কালো পটভূমি</string>
+    <string name="setIcon">আইকন সেট করুন</string>
+    <string name="settings_grey_theme">ধূসর</string>
+    <string name="updateBalance">ব্যালেন্স আপডেট করুন</string>
+    <string name="barcodeLongPressMessage">গ্যালারি অ্যাপে শুধুমাত্র ছবি খোলা যাবে</string>
+    <string name="translate_platform">Weblate-এ</string>
+    <string name="on_google_play">Google Play-তে</string>
+    <string name="action_show_details">বিস্তারিত দেখাও</string>
+    <string name="action_hide_details">আড়াল বিস্তারিত</string>
+    <string name="shortcutSelectCard">একটি কার্ড নির্বাচন করুন</string>
+    <string name="options">অপশন</string>
+    <string name="starred">তারকাচিহ্নিত</string>
+    <string name="duplicateCard">নকল</string>
+    <string name="include_if_asking_support">আপনি যদি সমর্থনের জন্য অনুরোধ করতে চান তবে নিম্নলিখিত তথ্যগুলি অন্তর্ভুক্ত করুন:</string>
+    <string name="importFidme">FidMe থেকে আমদানি করুন</string>
+    <string name="validFromDate">বৈধ হবে</string>
+    <string name="anyDate">যেকোনো তারিখ</string>
+    <string name="previousCard">আগে</string>
+    <string name="exportPassword">আপনার রপ্তানি রক্ষা করার জন্য একটি পাসওয়ার্ড সেট করুন (ঐচ্ছিক)</string>
+    <string name="exportPasswordHint">পাসওয়ার্ড লিখুন</string>
+    <string name="license">লাইসেন্স</string>
+    <string name="source_repository">Source Repository</string>
+    <string name="and_data_usage">এবং ডেটা ব্যবহার</string>
+    <string name="rate_this_app">এই অ্যাপ্লিকেশন রেট করুন</string>
+    <string name="archive">সংরক্ষণ করুন</string>
+    <string name="unarchive">সংরক্ষণাগারমুক্ত করুন</string>
+    <string name="archived">কার্ড সংরক্ষণাগারভুক্ত</string>
+    <string name="noUnarchivedCardsMessage">আর্কাইভ করা কোনো কার্ড নেই</string>
+    <string name="welcome">Catima-তে স্বাগতম</string>
+    <string name="updateBalanceTitle">আপনি কত খরচ করেছেন\?</string>
+    <string name="updateBalanceHint">পরিমান লিখুন</string>
+    <string name="currentBalanceSentence">বর্তমান ব্যালেন্স: <xliff:g>%s</xliff:g></string>
 </resources>

app/src/main/res/values-bn/strings.xml

@@ -18,7 +18,6 @@
     <string name="sort_by_name">নাম</string>
     <string name="previousCard">পূর্ববর্তী</string>
     <string name="all">সকল</string>
-    <string name="barcode">বারকোড</string>
     <string name="never">কখনো না</string>
     <string name="currency">মুদ্রা</string>
     <string name="settings_violet_theme">বেগুনি</string>
@@ -52,4 +51,5 @@
         <item quantity="other"><xliff:g>%d</xliff:g> কার্ডগুলো মুছুন</item>
     </plurals>
     <string name="deleteTitle">কার্ড মুছুন</string>
-</resources>
+    <string name="noGiftCards">একটি কার্ড যোগ করতে + প্লাস বোতামে ক্লিক করুন বা ⋮ মেনু থেকে আমদানি করুন।</string>
+</resources>

app/src/main/res/values-bs/strings.xml

@@ -21,7 +21,6 @@
     <string name="intent_import_card_from_url_share_text">Želim podijeliti čestitku s tobom</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Spriječi zaključavanje ekrana</string>
     <string name="settings_keep_screen_on">Zadrži ekran</string>
-    <string name="settings_max_font_size_scale">Max. veliäťina fonta</string>
     <string name="settings_light_theme">Svjetlo</string>
     <string name="settings_system_theme">Sistem</string>
     <string name="settings_theme">Tema</string>
@@ -65,7 +64,6 @@
     <string name="settings_green_theme">Zeleno</string>
     <string name="settings_brown_theme">Braun</string>
     <string name="sort">Poništi sortiranje</string>
-    <string name="swipeToSwitchImages">Swipe ili long press za prebacivanje slika</string>
     <string name="sort_by_name">Ime</string>
     <string name="sort_by_most_recently_used">Nedavno Korišten</string>
     <string name="sort_by_expiry">Sajam</string>

app/src/main/res/values-ca/strings.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="groups">Grups</string>
+    <string name="action_add">Afegeix</string>
+    <string name="save">Desa</string>
+    <string name="edit">Edita</string>
+    <string name="delete">Elimina</string>
+    <string name="confirm">Confirma</string>
+    <string name="ok">D\'acord</string>
+    <string name="importExport">Importa/Exporta</string>
+    <string name="exportName">Exporta</string>
+    <string name="action_search">Cerca</string>
+    <string name="deleteTitle">Elimina la targeta</string>
+    <string name="welcome">Benvingut a Catima</string>
+    <string name="noGiftCards">Cliqueu el botó + més per afegir una targeta, o importeu-ne des del ⋮ menú.</string>
+    <string name="photos">Fotos</string>
+</resources>

app/src/main/res/values-cs/strings.xml

@@ -29,40 +29,36 @@
     <string name="exportFailed">Export nelze provést</string>
     <string name="importing">Importuji…</string>
     <string name="exporting">Exportuji…</string>
-    <string name="noExternalStoragePermissionError">Udělit oprávnění přístupu k externímu úložišti pro import nebo export dat</string>
     <string name="importOptionFilesystemTitle">Import ze souborového systému</string>
     <string name="importOptionFilesystemExplanation">Vyberte konkrétní soubor v úložišti.</string>
     <string name="importOptionFilesystemButton">Ze souborového systému</string>
     <string name="importOptionApplicationTitle">Použitím jiné aplikace</string>
-    <string name="importOptionApplicationExplanation">K otevření souboru použijte libovolnou aplikaci nebo svého oblíbeného správce souborů.</string>
+    <string name="importOptionApplicationExplanation">K otevření souboru použijte libovolnou aplikaci nebo svého oblíbeného správce souborů.</string>
     <string name="importOptionApplicationButton">Použít jinou aplikaci</string>
     <string name="about">O aplikaci</string>
-    <string name="app_license">Copyleftovaný svobodný software s licencí GPLv3+</string>
+    <string name="app_license">Copyleftovaný svobodný software s licencí GPLv3+</string>
     <string name="about_title_fmt">O aplikaci <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Verze: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Informace o revizi: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Vyberte čárový kód</string>
     <string name="copy_to_clipboard_toast">ID zkopírováno do schránky</string>
     <string name="deleteTitle">Smazat kartu</string>
     <string name="deleteConfirmation">Opravdu chcete smazat tuto kartu\?</string>
-    <string name="moveBarcodeToCenterOfScreen">Vycentrovat čárový kód na obrazovce</string>
     <string name="moveBarcodeToTopOfScreen">Přesunout čárový kód do horní části obrazovky</string>
     <string name="chooseExpiryDate">Zvolte datum vypršení platnosti</string>
     <string name="never">Nikdy</string>
-    <string name="expiryDate">Platnost</string>
+    <string name="expiryDate">Vypršení platnosti</string>
     <string name="editBarcode">Upravit čárový kód</string>
-    <string name="barcode">Kód</string>
     <string name="app_resources">Svobodné zdroje třetích stran: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Svobodné knihovny třetích stran: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_copyright_old">Na základě Loyalty Card Keychain
+    <string name="app_copyright_old">Založeno na Loyalty Card Keychain
 \ncopyright © 2016–2020 Branden Archer</string>
     <string name="exportOptionExplanation">Data budou zapsána na místo podle vašeho výběru.</string>
-    <string name="failedParsingImportUriError">Nelze analyzovat import URI</string>
+    <string name="failedParsingImportUriError">Nelze analyzovat importovanou URI</string>
     <string name="noCardExistsError">Takovou kartu nelze najít</string>
     <string name="noCardsMessage">Nejprve přidejte kartu</string>
     <string name="cardShortcut">Zástupce karty</string>
-    <string name="share">Podíl</string>
-    <string name="unstar">Odebrat z oblíbených</string>
+    <string name="share">Sdílet</string>
+    <string name="unstar">Odebrat z oblíbených</string>
     <string name="star">Přidat do oblíbených</string>
     <string name="noBarcode">Žádný čárový kód</string>
     <string name="barcodeNoBarcode">Tato karta nemá čárový kód</string>
@@ -72,9 +68,9 @@
     <string name="thumbnailDescription">Miniatura</string>
     <string name="card_ids_copied">ID zkopírováno</string>
     <plurals name="deleteCardsConfirmation">
-        <item quantity="one">Opravdu chcete <xliff:g>%d</xliff:g> kartu trvale odstranit\?</item>
-        <item quantity="few">Opravdu chcete <xliff:g>%d</xliff:g> karty trvale odstranit\?</item>
-        <item quantity="other">Opravdu chcete <xliff:g>%d</xliff:g> karet trvale odstranit\?</item>
+        <item quantity="one">Opravdu chcete trvale odstranit <xliff:g>%d</xliff:g> kartu\?</item>
+        <item quantity="few">Opravdu chcete trvale odstranit <xliff:g>%d</xliff:g> karty\?</item>
+        <item quantity="other">Opravdu chcete trvale odstranit <xliff:g>%d</xliff:g> karet\?</item>
     </plurals>
     <plurals name="deleteCardsTitle">
         <item quantity="one">Odstranit <xliff:g>%d</xliff:g> kartu</item>
@@ -82,10 +78,9 @@
         <item quantity="other">Odstranit <xliff:g>%d</xliff:g> karet</item>
     </plurals>
     <string name="importSuccessful">Data importována</string>
-    <string name="intent_import_card_from_url_share_text">Chci s Vámi sdílet kartu</string>
+    <string name="intent_import_card_from_url_share_text">Chci s Vámi sdílet kartu</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Bránit uzamykání obrazovky</string>
     <string name="settings_keep_screen_on">Udržovat obrazovku zapnutou</string>
-    <string name="settings_max_font_size_scale">Maximální velikost písma</string>
     <string name="settings_dark_theme">Tmavý</string>
     <string name="settings_light_theme">Světlý</string>
     <string name="settings_system_theme">Podle systému</string>
@@ -113,7 +108,7 @@
     <string name="settings_locale">Jazyk</string>
     <string name="turn_flashlight_off">Vypnout světlo</string>
     <string name="turn_flashlight_on">Zapnout světlo</string>
-    <string name="failedGeneratingShareURL">Nepodařilo se vygenerovat sdílenou adresu URL. Nahlaste to prosím.</string>
+    <string name="failedGeneratingShareURL">Nepodařilo se vygenerovat adresu URL pro sdílení. Nahlaste to prosím.</string>
     <string name="passwordRequired">Zadejte prosím heslo</string>
     <string name="no">Ne</string>
     <string name="yes">Ano</string>
@@ -133,23 +128,23 @@
     <string name="barcodeId">Hodnota čárového kódu</string>
     <string name="setBarcodeId">Nastavení hodnoty čárového kódu</string>
     <string name="sameAsCardId">Stejné jako ID</string>
-    <string name="importVoucherVaultMessage">Vyberte svůj <i>vouchervault.json</i> exportovaný z Voucher Vault, který chcete importovat.
+    <string name="importVoucherVaultMessage">Vyberte k importu svůj <i>vouchervault.json</i> exportovaný z Voucher Vault.
 \nVytvoříte jej tak, že nejprve stisknete tlačítko Exportovat v aplikaci Voucher Vault.</string>
-    <string name="importVoucherVault">Import z Voucher Vault</string>
-    <string name="importStocardMessage">Vyberte svůj <i>***-sync.zip</i> exportovaný z aplikace Stocard, který chcete importovat.
+    <string name="importVoucherVault">Import z Voucher Vault</string>
+    <string name="importStocardMessage">Vyberte k importu svůj <i>***.zip</i> exportovaný z aplikace Stocard.
 \nZískejte ji zasláním e-mailu na adresu support@stocardapp.com s žádostí o export vašich dat.</string>
     <string name="importStocard">Import ze Stocard</string>
-    <string name="importLoyaltyCardKeychainMessage">Vyberte <i>LoyaltyCardKeychain.csv</i> exportovaný z Loyalty Card Keychain, který chcete importovat.
+    <string name="importLoyaltyCardKeychainMessage">Vyberte k importu <i>LoyaltyCardKeychain.csv</i> exportovaný z Loyalty Card Keychain.
 \nVytvoříte jej z nabídky Import/Export v Loyalty Card Keychain tak, že tam nejprve stisknete tlačítko Exportovat.</string>
-    <string name="importLoyaltyCardKeychain">Import z Loyalty Card Keychain</string>
-    <string name="importFidmeMessage">Vyberte svůj <i>fidme-export-request-xxxxxx.zip</i> exportovaný z FidMe k importu a poté vyberte typy čárových kódů ručně.
+    <string name="importLoyaltyCardKeychain">Import z Loyalty Card Keychain</string>
+    <string name="importFidmeMessage">Vyberte k importu svůj <i>fidme-export-request-xxxxxx.zip</i> exportovaný z FidMe a poté vyberte typy čárových kódů ručně.
 \nVytvoříte jej ze svého profilu FidMe tak, že nejprve zvolíte možnost Ochrana dat a poté stisknete tlačítko Extrahovat moje data.</string>
-    <string name="importFidme">Import z FidMe</string>
+    <string name="importFidme">Import z FidMe</string>
     <string name="importCatimaMessage">Vyberte <i>catima.zip</i> exportovaný z aplikace Catima, který chcete importovat.
 \nVytvoříte jej z nabídky Import/Export jiné aplikace Catima tak, že v ní nejprve stisknete tlačítko Exportovat.</string>
-    <string name="importCatima">Import z Catima</string>
+    <string name="importCatima">Import z Catima</string>
     <string name="accept">Přijmout</string>
-    <string name="privacy_policy_popup_text">Oznámení o zásadách ochrany osobních údajů (vyžadováno některými obchody s aplikacemi):
+    <string name="privacy_policy_popup_text">Oznámení o zásadách ochrany osobních údajů (vyžadováno některými obchody s aplikacemi):
 \n
 \nNejsou shromažďovány žádné údaje, což může potvrdit každý, protože naše aplikace je svobodný software.</string>
     <string name="privacy_policy">Zásady soukromí</string>
@@ -162,7 +157,7 @@
     <string name="errorReadingImage">Obrázek se nepodařilo přečíst</string>
     <string name="noBarcodeFound">Čárový kód nenalezen</string>
     <string name="groupsList">Skupiny: <xliff:g>%s</xliff:g></string>
-    <string name="addFromImage">Výběr obrázku z galerie</string>
+    <string name="addFromImage">Výběr obrázku z galerie</string>
     <string name="addManually">Ruční zadání ID</string>
     <string name="leaveWithoutSaveConfirmation">Ukončit bez uložení\?</string>
     <string name="leaveWithoutSaveTitle">Ukončit</string>
@@ -190,11 +185,9 @@
     <string name="noGroupCards">Tato skupina je prázdná</string>
     <string name="sort_by">Seřadit podle</string>
     <string name="reverse">…v obráceném pořadí</string>
-    <string name="sort_by_balance">Zůstatek</string>
     <string name="sort_by_expiry">Vypršení</string>
     <string name="sort_by_most_recently_used">Naposledy použité</string>
     <string name="sort_by_name">Název</string>
-    <string name="swipeToSwitchImages">Přejetím přepínáte obrázky, dlouhým stisknutím otevřete obrázek v aplikaci pro galerii</string>
     <string name="sort">Seřadit</string>
     <string name="barcodeImageDescriptionWithType">Obrázek čárového kódu <xliff:g>%s</xliff:g></string>
     <string name="version_history">Historie verzí</string>
@@ -204,7 +197,7 @@
     <string name="on_github">na GitHubu</string>
     <string name="source_repository">Úložiště zdrojů</string>
     <string name="license">Licence</string>
-    <string name="help_translate_this_app">Pomozte s překladem této aplikace</string>
+    <string name="help_translate_this_app">Pomozte s překladem této aplikace</string>
     <string name="report_error">Nahlásit chybu</string>
     <string name="on_google_play">na Google Play</string>
     <string name="exportPassword">Nastavení hesla pro ochranu exportu (volitelné)</string>
@@ -216,15 +209,13 @@
     <string name="group_name_is_empty">Název skupiny nemůže být prázdný</string>
     <string name="group_updated">Skupina aktualizována</string>
     <string name="editGroup">Úprava skupiny: <xliff:g>%s</xliff:g></string>
-    <string name="noGiftCardsGroup">Zatím nemáte žádné věrnostní karty. Jakmile nějaké přidáte, můžete je přiřadit do skupiny zde.</string>
+    <string name="noGiftCardsGroup">Zatím nemáte žádné věrnostní karty. Jakmile nějaké přidáte, můžete je zde přiřadit do skupiny.</string>
     <string name="shortcutSelectCard">Vybrat kartu</string>
     <string name="action_show_details">Zobrazit detaily</string>
     <string name="action_hide_details">Skrýt detaily</string>
     <string name="translate_platform">na Weblate</string>
     <string name="showMoreInfo">Zobrazit podrobnosti</string>
-    <string name="hideMoreInfo">Skrýt podrobnosti</string>
-    <string name="starred">S hvězdičkou</string>
-    <string name="set_scale">Nastavení měřítka</string>
+    <string name="starred">S hvězdičkou</string>
     <string name="options">Volby</string>
     <plurals name="balancePoints">
         <item quantity="one"><xliff:g>%s</xliff:g> bod</item>
@@ -238,7 +229,7 @@
     <string name="settings_lock_on_opening_orientation">Zamknout podle orientace použité při otevření karty</string>
     <string name="archive">Archivovat</string>
     <string name="unarchive">Vrátit z archivu</string>
-    <string name="archiveList">Archivovat</string>
+    <string name="archiveList">Archiv</string>
     <string name="noUnarchivedCardsMessage">Nejsou žádné karty vrácené z archivu</string>
     <string name="unarchived">Karta vrácena z archivu</string>
     <string name="settings_card_orientation">Orientace čárového kódu</string>
@@ -270,4 +261,19 @@
     <string name="updateBalanceTitle">Kolik jste utratil\?</string>
     <string name="updateBalanceHint">Zadejte výši</string>
     <string name="newBalanceSentence">Nový zůstatek: <xliff:g>%s</xliff:g></string>
+    <string name="storageReadPermissionRequired">Pro tuto akci je potřeba oprávnění ke čtení úložiště…</string>
+    <string name="cameraPermissionRequired">Pro tuto akci je potřeba oprávnění k přístupu k fotoaparátu…</string>
+    <string name="validFromDate">Platnost od</string>
+    <string name="anyDate">Jakékoliv datum</string>
+    <string name="chooseValidFromDate">Vyberte datum počátku platnosti</string>
+    <string name="validFromSentence">Platnost od: <xliff:g>%s</xliff:g></string>
+    <string name="height">Výška:</string>
+    <string name="switchToFrontImage">Přepnout na přední obrázek</string>
+    <string name="switchToBackImage">Přepnout na zadní obrázek</string>
+    <string name="switchToBarcode">Přepnout na čárový kód</string>
+    <string name="openFrontImageInGalleryApp">Otevřít přední obrázek v galerii</string>
+    <string name="openBackImageInGalleryApp">Otevřít zadní obrázek v galerii</string>
+    <string name="setBarcodeHeight">Nastavit výšku čárového kódu</string>
+    <string name="donate">Přispět</string>
+    <string name="icon_header_click_text">Dlouhým stisknutím ikonu upravíte</string>
 </resources>

app/src/main/res/values-da/strings.xml

@@ -67,7 +67,6 @@
     <string name="importOptionFilesystemExplanation">Vælg en bestemt fil fra filsystemet.</string>
     <string name="importOptionFilesystemTitle">Import fra filsystem</string>
     <string name="exportOptionExplanation">Dataene skrives til en placering efter eget valg.</string>
-    <string name="noExternalStoragePermissionError">Giv først tilladelse til ekstern lagring til at importere eller eksportere kort</string>
     <string name="failedParsingImportUriError">Kunne ikke analysere import-URI\'en</string>
     <string name="noCardExistsError">Kunne ikke finde kort</string>
     <string name="noCardIdError">Der er ikke angivet noget kort-ID</string>

app/src/main/res/values-de/strings.xml

@@ -36,7 +36,6 @@
     <string name="exportFailed">Export konnte nicht durchgeführt werden</string>
     <string name="importing">Importiere…</string>
     <string name="exporting">Exportiere…</string>
-    <string name="noExternalStoragePermissionError">Berechtigung für den externen Speicher zum Importieren oder Exportieren von Daten erteilen</string>
     <string name="importOptionFilesystemTitle">Importiere aus dem Dateisystem</string>
     <string name="importOptionFilesystemExplanation">Wähle eine Datei vom Dateisystem aus.</string>
     <string name="importOptionFilesystemButton">Wähle vom Dateisystem</string>
@@ -47,13 +46,12 @@
     <string name="app_license">Freie Software, lizensiert unter der GPLv3+</string>
     <string name="about_title_fmt">Über <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Revisionsinfo: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Barcode auswählen</string>
     <string name="copy_to_clipboard_toast">ID in die Zwischenablage kopiert</string>
     <string name="thumbnailDescription">Vorschaubild</string>
     <string name="settings">Einstellungen</string>
     <string name="settings_category_title_ui">Benutzeroberfläche</string>
-    <string name="settings_display_barcode_max_brightness">Barcodeansicht aufhellen</string>
+    <string name="settings_display_barcode_max_brightness">Displayhelligkeit in der Barcodeansicht erhöhen</string>
     <string name="exportSuccessful">Daten exportiert</string>
     <string name="importSuccessful">Daten importiert</string>
     <string name="intent_import_card_from_url_share_text">Ich würde gerne diese Karte mit dir teilen</string>
@@ -94,19 +92,17 @@
     <string name="points">Punkte</string>
     <string name="currency">Währung</string>
     <string name="balance">Guthaben</string>
-    <string name="moveBarcodeToCenterOfScreen">Barcode auf dem Bildschirm zentrieren</string>
     <string name="moveBarcodeToTopOfScreen">Barcode auf dem Bildschirm oben fixieren</string>
     <string name="chooseExpiryDate">Ablaufdatum wählen</string>
     <string name="never">Nie</string>
     <string name="expiryDate">Ablaufdatum</string>
     <string name="editBarcode">Barcode ändern</string>
-    <string name="barcode">Strichcode</string>
     <string name="card">Karte</string>
     <string name="balanceSentence">Guthaben: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Abgelaufen: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Läuft ab: <xliff:g>%s</xliff:g></string>
     <string name="settings_disable_lockscreen_while_viewing_card">Sperrbildschirm verhindern</string>
-    <string name="settings_keep_screen_on">Bildschirm aktiv halten</string>
+    <string name="settings_keep_screen_on">Bildschirm aktiv lassen</string>
     <string name="privacy_policy_popup_text">Hinweis zum Datenschutz (oft gefordert):
 \n
 \nKEINE DATEN WERDEN GESAMMELT, was jeder bestätigen kann, da unsere Anwendung eine freie Software ist.</string>
@@ -130,7 +126,6 @@
     <string name="errorReadingImage">Bildverarbeitung fehlgeschlagen</string>
     <string name="noBarcodeFound">Kein Barcode erkannt</string>
     <string name="addFromImage">Bild aus der Galerie wählen</string>
-    <string name="settings_max_font_size_scale">Maximale Schriftgröße</string>
     <string name="unsupportedBarcodeType">Dieser Barcodetyp kann noch nicht angezeigt werden. Wir hoffen das Format in einer zukünftigen Version zu unterstützen.</string>
     <string name="wrongValueForBarcodeType">Der Wert ist für den gewählten Barcodetyp leider nicht gültig</string>
     <string name="app_resources">Freie Ressourcen von Drittanbietern: <xliff:g id="app_resources_list">%s</xliff:g></string>
@@ -151,7 +146,7 @@
     <string name="frontImageDescription">Bild auf der Vorseite</string>
     <string name="backImageDescription">Bild auf der Rückseite</string>
     <string name="passwordRequired">Bitte gib das Passwort ein</string>
-    <string name="importStocardMessage">Wähle deinen <i>***-sync.zip</i>-Export aus Stocard zum Importieren aus.
+    <string name="importStocardMessage">Wähle deinen <i>***.zip</i>-Export aus Stocard zum Importieren aus.
 \nSie erhalten ihn, indem du eine E-Mail an support@stocardapp.com sendest und um einen Export deiner Daten bitten.</string>
     <string name="importStocard">Von Stocard importieren</string>
     <string name="turn_flashlight_off">Licht ausschalten</string>
@@ -185,9 +180,7 @@
     <string name="settings_theme_color">Designfarbe</string>
     <string name="app_contributors">Ermöglicht durch: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="barcodeImageDescriptionWithType">Bild <xliff:g>%s</xliff:g> Barcode</string>
-    <string name="swipeToSwitchImages">Wischen zum Wechseln der Bilder, Halten zum Öffnen des Bildes in der Galerie</string>
     <string name="sort_by">Sortieren nach</string>
-    <string name="sort_by_balance">Kontostand</string>
     <string name="sort_by_expiry">Ablaufdatum</string>
     <string name="sort_by_most_recently_used">Zuletzt verwendet</string>
     <string name="sort_by_name">Name</string>
@@ -218,15 +211,13 @@
     <string name="translate_platform">auf Weblate</string>
     <string name="shortcutSelectCard">Wählen Sie eine Karte</string>
     <string name="options">Optionen</string>
-    <string name="hideMoreInfo">Infos ausblenden</string>
-    <string name="set_scale">Größe festlegen</string>
     <string name="showMoreInfo">Infos anzeigen</string>
     <string name="starred">als Favorit</string>
     <plurals name="balancePoints">
         <item quantity="one"><xliff:g>%s</xliff:g> Punkt</item>
         <item quantity="other"><xliff:g>%s</xliff:g> Punkte</item>
     </plurals>
-    <string name="settings_oled_dark">Rein schwarzer Hintergrund für dunkles Thema</string>
+    <string name="settings_oled_dark">Komplett schwarzer Hintergrund im dunklen Design</string>
     <string name="include_if_asking_support">Wenn Sie Unterstützung anfordern möchten, geben Sie bitte die folgenden Informationen an:</string>
     <string name="settings_follow_system_orientation">System folgen</string>
     <string name="settings_landscape_orientation">Landschaft</string>
@@ -263,4 +254,10 @@
     <string name="currentBalanceSentence">Aktuelles Guthaben: <xliff:g>%s</xliff:g></string>
     <string name="newBalanceSentence">Neues Guthaben: <xliff:g>%s</xliff:g></string>
     <string name="updateBalance">Guthaben aktualisieren</string>
+    <string name="storageReadPermissionRequired">Berechtigung zum Lesen des Speichers für diese Aktion erforderlich …</string>
+    <string name="cameraPermissionRequired">Für diese Aktion wird die Erlaubnis zum Zugriff auf die Kamera benötigt …</string>
+    <string name="validFromDate">Gültig ab</string>
+    <string name="validFromSentence">Gültig ab: <xliff:g>%s</xliff:g></string>
+    <string name="chooseValidFromDate">Gültig-ab-Datum wählen</string>
+    <string name="anyDate">Beliebiges Datum</string>
 </resources>

app/src/main/res/values-el-rGR/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_add">Προσθήκη</string>
-    <string name="noGiftCards">Κάντε κλικ στο + κουμπί για να προσθέσετε μία κάρτα ή εισάγετε κάρτες από το ⋮ μενού.</string>
+    <string name="noGiftCards">Κάντε κλικ στο + κουμπί για να προσθέσετε μία κάρτα ή προσθέστε από το ⋮ μενού.</string>
     <string name="storeName">Όνομα</string>
     <string name="note">Σημείωση</string>
     <string name="cardId">Κωδικός Κάρτας</string>
@@ -32,7 +32,6 @@
     <string name="exportFailed">Δεν ήταν δυνατή η εξαγωγή</string>
     <string name="importing">Γίνεται εισαγωγή του…</string>
     <string name="exporting">Γίνεται εξαγωγή του…</string>
-    <string name="noExternalStoragePermissionError">Εγκρίνετε την άδεια εξωτερικής αποθήκευσης για να εισάγετε ή εξάγετε δεδομένα</string>
     <string name="importOptionFilesystemTitle">Εισαγωγή από το σύστημα αρχείων</string>
     <string name="importOptionFilesystemExplanation">Επιλέξτε ένα συγκεκριμένο αρχείο από το σύστημα αρχείων.</string>
     <string name="importOptionFilesystemButton">Από το σύστημα αρχείων</string>
@@ -43,7 +42,6 @@
     <string name="app_license">Άδεια χρήσης υπό GPLv3+</string>
     <string name="about_title_fmt">Σχετικά με <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Έκδοση: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Πληροφορίες Αναθεώρησης: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Επιλέξτε Barcode</string>
     <string name="copy_to_clipboard_toast">Ο κωδικός αντιγράφτηκε στο πρόχειρο</string>
     <string name="thumbnailDescription">Μικρογραφία</string>
@@ -52,7 +50,6 @@
     <string name="settings_dark_theme">Σκοτεινό</string>
     <string name="settings_light_theme">Φωτεινό</string>
     <string name="settings_system_theme">Σύστημα</string>
-    <string name="barcode">Γραμμικός κώδικας</string>
     <string name="deleteTitle">Διαγραφή Κάρτας</string>
     <string name="deleteConfirmation">Μόνιμη διαγραφή της κάρτας;</string>
     <string name="action_search">Αναζήτηση</string>
@@ -85,8 +82,6 @@
     <string name="expiryDate">Ημερομηνία λήξης</string>
     <string name="settings_keep_screen_on">Κράτα την οθόνη ανοιχτή</string>
     <string name="leaveWithoutSaveTitle">Έξοδος</string>
-    <string name="swipeToSwitchImages">Σύρετε ή πατήστε παρατεταμένα για να αλλάξετε εικόνες</string>
-    <string name="sort_by_balance">Υπόλοιπο</string>
     <string name="reverse">... σε αντίθετη σειρά</string>
     <string name="version_history">Ιστορικό έκδοσης</string>
     <string name="sort_by">Ταξινόμηση κατά</string>
@@ -98,7 +93,6 @@
     <string name="report_error">Αναφορά Σφάλματος</string>
     <string name="starred">Αγαπημένα</string>
     <string name="translate_platform">στο Weblate</string>
-    <string name="set_scale">Ορίστε κλίμακα</string>
     <string name="importLoyaltyCardKeychain">Εισαγωγή από Loyalty Card Keychain</string>
     <string name="importLoyaltyCardKeychainMessage">Επιλέξτε την <i>LoyaltyCardKeychain.csv</i> εξαγωγή από το Loyalty Card Keychain για εισαγωγή.
 \nΔημιουργήστε το από το μενού Εισαγωγής/Εξαγωγής στο Loyalty Card Keychain επιλέγοντας Εξαγωγή.</string>
@@ -114,7 +108,6 @@
     <string name="updateBarcodeQuestionText">Αλλάξατε τον κωδικό. Θέλετε να ενημερώσετε και τον γραμμοκώδικα στην ίδια τιμή;</string>
     <string name="action_show_details">Εμφάνιση λεπτομερειών</string>
     <string name="options">Επιλογές</string>
-    <string name="hideMoreInfo">Απόκρυψη πληροφοριών</string>
     <string name="noGroupCards">Αυτή η ομάδα είναι άδεια</string>
     <string name="settings_display_barcode_max_brightness">Επιπλέον φωτισμός γραμμοκώδικα</string>
     <string name="group_name_is_empty">Το όνομα ομάδας δεν γίνεται να είναι κενό</string>
@@ -141,7 +134,7 @@
     </plurals>
     <string name="importCatimaMessage">Επιλέξτε την <i>catima.zip</i> εξαγωγή από το Catima για εισαγωγή
 \nΔημιουργήστε το από το μενού Εισαγωγής/Εξαγωγής μιας άλλης εφαρμογής Catima κάνοντας εξαγωγή εκεί πρώτα.</string>
-    <string name="importStocardMessage">Επιλέξτε την <i>***-sync.zip</i> εξαγωγή από το Stocard για εισαγωγή.
+    <string name="importStocardMessage">Επιλέξτε την <i>***.zip</i> εξαγωγή από το Stocard για εισαγωγή.
 \nΠάρτε το στέλνοντας email στο: support@stocardapp.com ζητώντας μια εξαγωγή αρχείων των δεδομένων σας.</string>
     <string name="intent_import_card_from_url_share_multiple_text">Θέλω να μοιραστώ μερικές κάρτες μαζί σου</string>
     <string name="editGroup">Επεξεργασία Ομάδας: <xliff:g>%s</xliff:g></string>
@@ -197,7 +190,6 @@
     <string name="settings_landscape_orientation">Οριζόντια</string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Πνευματικά δικαιώματα © 2019-<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="settings_lock_on_opening_orientation">Κλείδωμα τωρινού προσανατολισμού όταν ανοίγει μία κάρτα</string>
-    <string name="settings_max_font_size_scale">Μέγιστο μέγεθος γραμματοσειράς</string>
     <string name="intent_import_card_from_url_share_text">Θέλω να μοιραστώ μία κάρτα μαζί σου</string>
     <string name="enter_group_name">Εισάγετε όνομα ομάδας</string>
     <string name="groups">Ομάδες</string>
@@ -212,7 +204,6 @@
     <string name="editBarcode">Επεξεργασία γραμμοκώδικα</string>
     <string name="chooseExpiryDate">Επιλέξτε ημερομηνία λήξης</string>
     <string name="moveBarcodeToTopOfScreen">Μετακίνηση του γραμμοκώδικα στο πάνω μέρος της οθόνης</string>
-    <string name="moveBarcodeToCenterOfScreen">Κεντράρισμα του γραμμοκώδικα στην οθόνη</string>
     <string name="noBarcodeFound">Δεν βρέθηκε γραμμοκώδικας</string>
     <string name="balance">Υπόλοιπο</string>
     <string name="importCatima">Εισαγωγή από Catima</string>
@@ -245,4 +236,22 @@
     <string name="unarchive">Αφαίρεση από το αρχείο</string>
     <string name="archiveList">Αρχείο</string>
     <string name="noUnarchivedCardsMessage">Δεν υπάρχουν αρχειοθετημένες κάρτες</string>
+    <string name="updateBalanceTitle">Πόσα ξοδέψατε;</string>
+    <string name="cameraPermissionDeniedTitle">Αδύνατη η πρόσβαση στην κάμερα</string>
+    <string name="failedToRetrieveImageFile">Αποτυχία ανάκτησης αρχείου εικόνας</string>
+    <string name="previousCard">Προηγούμενη</string>
+    <string name="nextCard">Επόμενη</string>
+    <string name="updateBalance">Ενημέρωση υπολοίπου</string>
+    <string name="barcodeLongPressMessage">Μόνο εικόνες μπορούν να ανοιχτούν στην εφαρμογή φωτογραφιών</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Για να σκανάρετε γραμμοκώδικες, θα χρειαστεί πρόσβαση στην κάμερα από το Catima. Πατήστε εδώ για να δώσετε πρόσβαση.</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Προβολή αρχείου (<xliff:g>%1$d</xliff:g> κάρτας)</item>
+        <item quantity="other">Προβολή αρχείου (<xliff:g>%1$d</xliff:g> καρτών)</item>
+    </plurals>
+    <string name="importCards">Εισαγωγή καρτών</string>
+    <string name="updateBalanceHint">Εισάγετε ποσό</string>
+    <string name="currentBalanceSentence">Τωρινό υπόλοιπο <xliff:g>%s</xliff:g></string>
+    <string name="newBalanceSentence">Νέο υπόλοιπο: <xliff:g>%s</xliff:g></string>
+    <string name="failedToOpenUrl">Εγκαταστήστε έναν περιηγητή πρώτα</string>
+    <string name="welcome">Καλώς ήρθατε στο Catima</string>
 </resources>

app/src/main/res/values-eo/strings.xml

@@ -31,7 +31,6 @@
     <string name="points">Poentoj</string>
     <string name="currency">Valuto</string>
     <string name="editBarcode">Redakti strekokodon</string>
-    <string name="barcode">Strekokodo</string>
     <string name="card">Karto</string>
     <string name="never">Neniam</string>
     <string name="groupsList">Grupoj: <xliff:g>%s</xliff:g></string>
@@ -53,7 +52,6 @@
     <string name="deleteConfirmation">Ĉu forigi ĉi tiun karton\?</string>
     <string name="deleteTitle">Forigi karton</string>
     <string name="settings_display_barcode_max_brightness">Heligi barcode vido</string>
-    <string name="settings_max_font_size_scale">Max. tiparo grandeco</string>
     <string name="starImage">Preferata stelo</string>
     <string name="thumbnailDescription">Bildeto por karto</string>
     <string name="app_copyright_old">Bazita sur Lojaleco Karto Keychain
@@ -63,7 +61,6 @@
     <string name="importOptionApplicationTitle">Uzi alian app</string>
     <string name="importOptionFilesystemExplanation">Elektu specifa dosiero de la dosiersistemo.</string>
     <string name="exportOptionExplanation">La datumoj estos skribita al loko de via elekto.</string>
-    <string name="noExternalStoragePermissionError">Grant ekstera stokado permeso de importado aŭ eksportado kartoj unua</string>
     <string name="exportFailed">Ne povis eksporti kartoj</string>
     <string name="importFailed">Ne povis importi kartoj</string>
     <string name="importExportHelp">Subtenanta supre vian kartoj permesas vin movi ilin al alia aparato.</string>

app/src/main/res/values-es-rAR/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="barcode">Código de barras</string>
     <string name="ok">OK</string>
     <string name="barcodeNoBarcode">No hay código de barra</string>
     <string name="storeName">Nombre</string>

app/src/main/res/values-es/strings.xml

@@ -32,7 +32,6 @@
     <string name="exportFailed">No se han podido exportar</string>
     <string name="importing">Importando…</string>
     <string name="exporting">Exportando…</string>
-    <string name="noExternalStoragePermissionError">Otorgar permiso de almacenamiento para importar o exportar datos</string>
     <string name="importOptionFilesystemTitle">Importar desde el sistema de archivos</string>
     <string name="importOptionFilesystemExplanation">Elegir un archivo concreto del sistema de archivos.</string>
     <string name="importOptionFilesystemButton">Desde el sistema de archivos</string>
@@ -63,7 +62,6 @@
     <string name="barcodeType">Tipo de código de barras</string>
     <string name="noMatchingGiftCards">Sin resultados. Intente cambiar su búsqueda.</string>
     <string name="action_search">Buscar</string>
-    <string name="app_revision_fmt">Información de la revisión: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="noGroups">Pulse en el botón «+» para añadir grupos de categorización.</string>
     <string name="starImage">Estrella favorita</string>
     <string name="thumbnailDescription">Miniatura</string>
@@ -89,27 +87,24 @@
         <item quantity="other"><xliff:g>%d</xliff:g> tarjetas</item>
     </plurals>
     <string name="points">Puntos</string>
-    <string name="moveBarcodeToCenterOfScreen">Centre el código de barras en la pantalla</string>
     <string name="moveBarcodeToTopOfScreen">Mueva el código de barras a la zona superior de la pantalla</string>
     <string name="chooseExpiryDate">Elegir fecha de caducidad</string>
     <string name="never">Nunca</string>
     <string name="expiryDate">Fecha de caducidad</string>
     <string name="editBarcode">Editar el código de barras</string>
-    <string name="barcode">Código de barras</string>
     <string name="card">Tarjeta</string>
     <string name="expiryStateSentenceExpired">Expirado: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Expira: <xliff:g>%s</xliff:g></string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Derechos de autor © 2019-<xliff:g>%d</xliff:g> de Sylvia van Os</string>
     <string name="app_resources">Recursos de terceros libres: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Bibliotecas de terceros libres: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="settings_max_font_size_scale">Tam. de fuente máximo</string>
     <string name="importCatimaMessage">Seleccione su <i>catima.zip</i> exportado desde Catima para importarlo.
 \nCréalo primero desde el menú Importar/Exportar de otra app de Catima al presionar Exportar desde allí.</string>
     <string name="importFidmeMessage">Seleccione su <i>fidme-export-request-xxxxxx.zip</i> exportado desde FidMe para importar, y luego escoja los tipos de códigos de barras manualmente.
 \nCréalo primero desde tu perfil de FidMe eligiendo Protección de datos y pulsa Extraer mis datos.</string>
     <string name="importLoyaltyCardKeychainMessage">Seleccione su <i>LoyaltyCardKeychain.csv</i> exportado desde Loyalty Card Keychain para importarlo.
 \nCréalo primero desde el menú Importar/Exportar en Loyalty Card Keychain pulsando Exportar desde allí.</string>
-    <string name="importStocardMessage">Seleccione su exportación <i>*-sync.zip</i> de Stocard para importarla.
+    <string name="importStocardMessage">Seleccione su exportación <i>*.zip</i> de Stocard para importarla.
 \nConsígalo enviando un correo electrónico a support@stocardapp.com solicitando una exportación de sus datos.</string>
     <string name="importVoucherVaultMessage">Seleccione su <i>vouchervault.json</i> exportado desde Voucher Vault para importarlo.
 \nCréalo pulsando primero Exportar en Voucher Vault.</string>
@@ -158,8 +153,9 @@
     <string name="settings_disable_lockscreen_while_viewing_card">Evitar el bloqueo de pantalla</string>
     <string name="settings_keep_screen_on">Mantener pantalla encendida</string>
     <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> tarjeta seleccionada</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> tarjetas seleccionadas</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> seleccionada</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> seleccionadas</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> seleccionadas</item>
     </plurals>
     <string name="deleteTitle">Eliminar la tarjeta</string>
     <string name="deleteConfirmation">¿Quiere eliminar permanentemente esta tarjeta\?</string>
@@ -203,19 +199,16 @@
     <string name="settings_lock_on_opening_orientation">Bloqueo a la orientación utilizada al abrir la tarjeta</string>
     <string name="sort_by_most_recently_used">Lo más reciente que se ha utilizado</string>
     <string name="sort_by_expiry">Caducidad</string>
-    <string name="sort_by_balance">Saldo</string>
     <string name="version_history">Historial de versiones</string>
     <string name="help_translate_this_app">Ayuda a traducir esta aplicación</string>
     <string name="and_data_usage">y el uso de datos</string>
     <string name="shortcutSelectCard">Seleccione una tarjeta</string>
     <string name="showMoreInfo">Mostrar información</string>
-    <string name="hideMoreInfo">Ocultar información</string>
     <string name="reverse">… en orden inverso</string>
     <string name="credits">Créditos</string>
     <string name="sort_by_name">Nombre</string>
     <string name="license">Licencia</string>
     <string name="source_repository">Repositorio de fuente</string>
-    <string name="set_scale">Ajustar la escala</string>
     <string name="on_github">En GitHub</string>
     <string name="on_google_play">en Google Play</string>
     <string name="report_error">Informar de un error</string>
@@ -225,7 +218,6 @@
     <string name="selectColor">Seleccione el color</string>
     <string name="setIcon">Establecer icono</string>
     <string name="sort">Ordenar</string>
-    <string name="swipeToSwitchImages">Desliza para cambiar de imagen, mantén presionado para abrir la imagen en la aplicación de la galería</string>
     <string name="sort_by">Ordenar por</string>
     <string name="rate_this_app">Califica esta aplicación</string>
     <string name="options">Opciones</string>
@@ -269,4 +261,18 @@
     <string name="cameraPermissionDeniedTitle">No se pudo acceder a la cámara</string>
     <string name="updateBalance">Actualizar el balance</string>
     <string name="importCards">Importar tarjetas</string>
+    <string name="storageReadPermissionRequired">Se necesita permiso para leer el almacenamiento para esta acción…</string>
+    <string name="cameraPermissionRequired">Se necesita permiso para acceder a la cámara para esta acción…</string>
+    <string name="anyDate">Cualquier fecha</string>
+    <string name="validFromDate">Válido desde</string>
+    <string name="chooseValidFromDate">Elija una fecha válida desde</string>
+    <string name="validFromSentence">Válido desde: <xliff:g>%s</xliff:g></string>
+    <string name="height">Altura:</string>
+    <string name="switchToFrontImage">Cambiar a imagen frontal</string>
+    <string name="openFrontImageInGalleryApp">Abrir imagen frontal en la aplicación de la galería</string>
+    <string name="openBackImageInGalleryApp">Abrir imagen trasera en la aplicación de la galería</string>
+    <string name="setBarcodeHeight">Ajustar la altura del código de barras</string>
+    <string name="donate">Donar</string>
+    <string name="switchToBarcode">Cambiar a código de barras</string>
+    <string name="switchToBackImage">Cambiar a imagen trasera</string>
 </resources>

app/src/main/res/values-fi/strings.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
-    <string name="noExternalStoragePermissionError">Salli käyttöoikeus ulkoisen tallennustilan käyttöön voidaksesi tuoda tai viedä tietoja</string>
     <string name="no">Ei</string>
     <string name="yes">Kyllä</string>
     <string name="updateBarcodeQuestionText">Vaihdoit ID-tunnuksen. Haluatko päivittää myös viivakoodin käyttämään samaa arvoa\?</string>
-    <string name="updateBarcodeQuestionTitle">Päivitä viivakoodin arvo\?</string>
+    <string name="updateBarcodeQuestionTitle">Päivitetäänkö viivakoodin arvo\?</string>
     <string name="intent_import_card_from_url_share_multiple_text">Haluan jakaa joitain kortteja kanssasi</string>
     <string name="copy_to_clipboard_multiple_toast">ID-tunnukset kopioitu leikepöydälle</string>
     <string name="wrongValueForBarcodeType">Arvo ei ole kelvollinen valitulle viivakoodityypille</string>
@@ -14,15 +13,15 @@
     <string name="barcodeId">Viivakoodin arvo</string>
     <string name="importVoucherVaultMessage">Valitse tuotava <i>vouchervault.json</i>-vienti Voucher Vaultista.
 \nLuo se painamalla ensin Vie Voucher Vaultissa.</string>
-    <string name="importVoucherVault">Tuo Voucher Vault varmuuskopiotiedostosta</string>
+    <string name="importVoucherVault">Tuo Voucher Vault -varmuuskopiotiedostosta</string>
     <string name="importLoyaltyCardKeychainMessage">Valitse tuotava <i>LoyaltyCardKeychain.csv</i>-vientitiedostosi Loyalty Card Keychainista.
 \nTai luo se Loyalty Card Keychainin Import/Export-valikosta painamalla ensin Export (Vie).</string>
     <string name="importLoyaltyCardKeychain">Tuo Loyalty Card Keychain varmuuskopiotiedostosta</string>
     <string name="importFidmeMessage">Valitse tuotava <i>fidme-export-request-xxxxxxxx.zip</i>-vientitiedostosi FidMe:stä ja valitse viivakoodityypit manuaalisesti sen jälkeen.
 \nLuo se FidMe-profiilistasi valitsemalla Tietosuoja ja painamalla ensin Extract my data.</string>
-    <string name="importFidme">Tuo FidMe varmuuskopiotiedostosta</string>
+    <string name="importFidme">Tuo FidMe-varmuuskopiotiedostosta</string>
     <string name="importCatimaMessage">Valitse tuotava <i>catima.zip</i>-vientitiedostosi Catimasta.
-\nLuo se Catima-sovelluksen Tuo/Vie-valikosta painamalla siellä ensin Vie.</string>
+\nLuo se Catima-sovelluksen Tuo/vie-valikosta painamalla siellä ensin Vie.</string>
     <string name="importCatima">Tuo Catima varmuuskopiotiedostosta</string>
     <string name="accept">Hyväksy</string>
     <string name="privacy_policy_popup_text">Tietosuojaseloste (joidenkin sovelluskauppojen vaatimus):
@@ -37,13 +36,11 @@
     <string name="balance">Saldo</string>
     <string name="errorReadingImage">Kuvaa ei voitu lukea</string>
     <string name="noBarcodeFound">Viivakoodia ei löytynyt</string>
-    <string name="moveBarcodeToCenterOfScreen">Keskitä viivakoodi näytölle</string>
     <string name="moveBarcodeToTopOfScreen">Siirrä viivakoodi näytön yläosaan</string>
     <string name="chooseExpiryDate">Valitse viimeinen voimassaolopäivä</string>
     <string name="never">Ei koskaan</string>
     <string name="expiryDate">Viimeinen voimassaolopäivä</string>
     <string name="editBarcode">Muokkaa viivakoodia</string>
-    <string name="barcode">Viivakoodi</string>
     <string name="card">Kortti</string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Vanhentunut: <xliff:g>%s</xliff:g></string>
@@ -51,18 +48,18 @@
     <string name="groupsList">Ryhmät: <xliff:g>%s</xliff:g></string>
     <string name="addFromImage">Valitse kuva galleriasta</string>
     <string name="addManually">Anna ID-tunnus manuaalisesti</string>
-    <string name="leaveWithoutSaveConfirmation">Poistu tallentamatta\?</string>
+    <string name="leaveWithoutSaveConfirmation">Poistutaanko tallentamatta\?</string>
     <string name="leaveWithoutSaveTitle">Poistu</string>
     <string name="moveDown">Siirrä alaspäin</string>
     <string name="moveUp">Siirrä ylöspäin</string>
     <string name="failedOpeningFileManager">Asenna ensin tiedostonhallintaohjelma.</string>
-    <string name="deleteConfirmationGroup">Poista ryhmä\?</string>
+    <string name="deleteConfirmationGroup">Poistetaanko ryhmä\?</string>
     <string name="all">Kaikki</string>
     <plurals name="groupCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> kortti</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> kortit</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> korttia</item>
     </plurals>
-    <string name="noGroups">Napsauta + plus-painiketta lisätäksesi ryhmät luokittelua varten.</string>
+    <string name="noGroups">Napsauta plus-painiketta (+) lisätäksesi ryhmät luokittelua varten.</string>
     <string name="groups">Ryhmät</string>
     <string name="enter_group_name">Anna ryhmän nimi</string>
     <string name="exportSuccessful">Tiedot viety</string>
@@ -71,25 +68,23 @@
     <string name="settings_disable_lockscreen_while_viewing_card">Estä näytön lukitus</string>
     <string name="settings_keep_screen_on">Pidä näyttö päällä</string>
     <string name="settings_display_barcode_max_brightness">Kirkasta viivakoodinäkymää</string>
-    <string name="settings_max_font_size_scale">Fontin enimmäiskoko</string>
     <string name="settings_dark_theme">Tumma</string>
     <string name="settings_light_theme">Vaalea</string>
     <string name="settings_system_theme">Järjestelmän oletus</string>
     <string name="settings_theme">Teema</string>
     <string name="settings_category_title_ui">Käyttöliittymä</string>
     <string name="settings">Asetukset</string>
-    <string name="starImage">Suosikki tähti</string>
+    <string name="starImage">Suosikkitähti</string>
     <string name="thumbnailDescription">Pienoiskuva</string>
     <string name="copy_to_clipboard_toast">ID-tunnus kopioitu leikepöydälle</string>
     <string name="enterBarcodeInstructions">Syötä ID-tunnus ja valitse sen viivakoodityyppi, tai valitse \"Ei viivakoodia\".</string>
     <string name="selectBarcodeTitle">Valitse viivakoodi</string>
     <string name="app_resources">Vapaat kolmannen osapuolen resurssit: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="app_libraries">Kolmannen osapuolen Libre-kirjastot: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_revision_fmt">Muutostiedot: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries">Vapaat kolmannen osapuolen kirjastot: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="debug_version_fmt">Versio: <xliff:g id="version">%s</xliff:g></string>
     <string name="about_title_fmt">Tietoja <xliff:g id="app_name">%s</xliff:g></string>
     <string name="app_license">Copyleft (käyttäjänoikeus) - vapaa ohjelmisto, lisenssi GPLv3+</string>
-    <string name="app_copyright_old">Perustuu Loyalty Card Keychain sovellukseen
+    <string name="app_copyright_old">Perustuu Loyalty Card Keychain -sovellukseen
 \ntekijänoikeus © 2016–2020 Branden Archer</string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Tekijänoikeus © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="about">Tietoja</string>
@@ -110,7 +105,7 @@
     <string name="importSuccessfulTitle">Tuonti valmis</string>
     <string name="importExportHelp">Tietojesi varmuuskopiointi mahdollistaa niiden siirtämisen toiseen laitteeseen.</string>
     <string name="exportName">Vie</string>
-    <string name="importExport">Tuo/Vie</string>
+    <string name="importExport">Tuo/vie</string>
     <string name="failedParsingImportUriError">Tuonnin URI: n jäsentäminen epäonnistui</string>
     <string name="noCardExistsError">Tätä korttia ei löytynyt</string>
     <string name="noCardIdError">ID-tunnusta ei annettu</string>
@@ -139,7 +134,7 @@
     <string name="note">Lisätieto</string>
     <string name="storeName">Nimi</string>
     <string name="noMatchingGiftCards">Ei hakutuloksia, kokeile toisella hakutermillä.</string>
-    <string name="noGiftCards">Lisää kortti napsauttamalla + plus-painiketta, tai mene ⋮ valikkoon tuodaksesi varmuuskopiosta.</string>
+    <string name="noGiftCards">Lisää kortti napsauttamalla plus-painiketta (+), tai mene ⋮-valikkoon tuodaksesi.</string>
     <string name="action_add">Lisää</string>
     <string name="action_search">Hae</string>
     <string name="takePhoto">Ota valokuva</string>
@@ -149,32 +144,32 @@
     <string name="photos">Valokuvat</string>
     <string name="backImageDescription">Takakuva</string>
     <string name="frontImageDescription">Etukuva</string>
-    <string name="deleteConfirmation">Poista tämä kortti\?</string>
+    <string name="deleteConfirmation">Poistetaanko tämä kortti\?</string>
     <string name="deleteTitle">Poista kortti</string>
     <plurals name="deleteCardsConfirmation">
-        <item quantity="one">Poista tämä <xliff:g>%d</xliff:g> kortti pysyvästi\?</item>
-        <item quantity="other">Poista tämä <xliff:g>%d</xliff:g> kortit pysyvästi\?</item>
+        <item quantity="one">Poistetaanko tämä <xliff:g>%d</xliff:g> kortti pysyvästi\?</item>
+        <item quantity="other">Poistetaanko nämä <xliff:g>%d</xliff:g> korttia pysyvästi\?</item>
     </plurals>
     <plurals name="deleteCardsTitle">
         <item quantity="one">Poista <xliff:g>%d</xliff:g>kortti</item>
-        <item quantity="other">Poista <xliff:g>%d</xliff:g>kortit</item>
+        <item quantity="other">Poista <xliff:g>%d</xliff:g>korttia</item>
     </plurals>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> valittu</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> valitut</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> valittu</item>
     </plurals>
     <string name="importStocard">Tuo Stocardista</string>
-    <string name="importStocardMessage">Valitse tuotava <i>***-sync.zip</i>-vienti Stocardista.
+    <string name="importStocardMessage">Valitse tuotava <i>***.zip</i>-vienti Stocardista.
 \nHanki se lähettämällä sähköpostia osoitteeseen support@stocardapp.com ja pyytämällä tietojesi vientiä.</string>
     <string name="passwordRequired">Ole hyvä ja syötä salasana</string>
-    <string name="failedGeneratingShareURL">Ei pystynyt luomaan jaettavaa URL-osoitetta. Ilmoita tästä.</string>
-    <string name="turn_flashlight_on">Sytytä taskulamppu</string>
+    <string name="failedGeneratingShareURL">Jaettavaa URL-osoitetta ei voitu luoda. Ilmoita tästä.</string>
+    <string name="turn_flashlight_on">Käytä taskulamppua</string>
     <string name="turn_flashlight_off">Sammuta salamavalo</string>
     <string name="app_contributors">Mahdollistanut: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="settings_brown_theme">Ruskea</string>
     <string name="settings_grey_theme">Harmaa</string>
     <string name="settings_green_theme">Vihreä</string>
-    <string name="settings_sky_blue_theme">Taivaan sininen</string>
+    <string name="settings_sky_blue_theme">Taivaansininen</string>
     <string name="settings_blue_theme">Siniset</string>
     <string name="settings_violet_theme">Violetti</string>
     <string name="settings_magenta_theme">Magenta</string>
@@ -195,11 +190,9 @@
     </plurals>
     <string name="settings_oled_dark">Musta tausta tummalle teemalle</string>
     <string name="setIcon">Aseta kuvake</string>
-    <string name="swipeToSwitchImages">Vaihda kuvia pyyhkäisemällä tai painamalla pitkään</string>
     <string name="sort_by_name">Nimi</string>
     <string name="sort_by_most_recently_used">Viimeksi käytetyt</string>
     <string name="sort_by_expiry">Viimeinen voimassaoloaika</string>
-    <string name="sort_by_balance">Saldo</string>
     <string name="reverse">...käänteisessä järjestyksessä</string>
     <string name="sort_by">Lajitteluperuste</string>
     <string name="credits">Krediitit</string>
@@ -215,9 +208,7 @@
     <string name="shortcutSelectCard">Valitse kortti</string>
     <string name="starred">Tähdellä merkityt</string>
     <string name="options">Vaihtoehdot</string>
-    <string name="set_scale">Säädä kokoa</string>
     <string name="include_if_asking_support">Jos haluat pyytää tukea, ilmoita seuraavat tiedot:</string>
-    <string name="hideMoreInfo">Piilota tiedot</string>
     <string name="exportPassword">Aseta salasana suojataksesi vientitiedostosi (valinnainen)</string>
     <string name="exportPasswordHint">Syötä salasana</string>
     <string name="showMoreInfo">Näytä tiedot</string>
@@ -227,10 +218,10 @@
     <string name="selectColor">Valitse väri</string>
     <string name="rate_this_app">Arvostele tämä sovellus</string>
     <string name="noGiftCardsGroup">Lisää kortteja ja lisää ne ryhmään täällä.</string>
-    <string name="barcodeImageDescriptionWithType">Image <xliff:g>%s</xliff:g> viivakoodi</string>
+    <string name="barcodeImageDescriptionWithType">Kuva <xliff:g>%s</xliff:g> viivakoodi</string>
     <string name="settings_follow_system_orientation">Seuraa järjestelmää</string>
-    <string name="settings_portrait_orientation">Muotokuva</string>
-    <string name="settings_landscape_orientation">Maisema</string>
+    <string name="settings_portrait_orientation">Pysty</string>
+    <string name="settings_landscape_orientation">Vaaka</string>
     <string name="unarchived">Kortti on poistettu arkistosta</string>
     <string name="noUnarchivedCardsMessage">Arkistoimattomia kortteja ei ole olemassa</string>
     <string name="unarchive">Poista arkistosta</string>
@@ -242,7 +233,7 @@
         <item quantity="one"><xliff:g>%1$d</xliff:g> kortti (<xliff:g id="archivedCount">%2$d</xliff:g> arkistoitu)</item>
         <item quantity="other"><xliff:g>%1$d</xliff:g> korttia (<xliff:g id="archivedCount">%2$d</xliff:g> arkistoitu)</item>
     </plurals>
-    <string name="duplicateCard">Duplikaatti</string>
+    <string name="duplicateCard">Kaksoiskappale</string>
     <string name="previousCard">Edellinen</string>
     <string name="nextCard">Seuraava</string>
     <string name="failedToOpenUrl">Asenna ensin verkkoselain</string>
@@ -251,4 +242,22 @@
         <item quantity="one">Näytä arkisto (<xliff:g>%1$d</xliff:g> kortti)</item>
         <item quantity="other">Näytä arkisto (<xliff:g>%1$d</xliff:g> korttia)</item>
     </plurals>
+    <string name="updateBalanceTitle">Kuinka paljon kulutit\?</string>
+    <string name="updateBalanceHint">Syötä summa</string>
+    <string name="barcodeLongPressMessage">Vain kuvia on mahdollista avata galleriasovelluksessa</string>
+    <string name="archive">Arkistoi</string>
+    <string name="importCards">Tuo kortteja</string>
+    <string name="failedToRetrieveImageFile">Kuvatiedoston noutaminen epäonnistui</string>
+    <string name="currentBalanceSentence">Nykyinen saldo: <xliff:g>%s</xliff:g></string>
+    <string name="newBalanceSentence">Uusi saldo: <xliff:g>%s</xliff:g></string>
+    <string name="cameraPermissionDeniedTitle">Ei pääsyä kameraan</string>
+    <string name="settings_lock_on_opening_orientation">Lukitse suunta, kun korttia avataan</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Viivakoodien lukeminen vaatii, että Catimalla on käyttöoikeus kameraan. Napauta tästä muuttaaksesi oikeuksia.</string>
+    <string name="updateBalance">Päivitä saldo</string>
+    <string name="cameraPermissionRequired">Tämä toiminto vaatii oikeuden käyttää kameraa…</string>
+    <string name="storageReadPermissionRequired">Tämä toiminto vaatii oikeuden lukea tallennustilaa…</string>
+    <string name="validFromDate">Kelvollinen alkaen</string>
+    <string name="anyDate">Mikä tahansa päivämäärä</string>
+    <string name="chooseValidFromDate">Valitse kelvollinen päivämäärä</string>
+    <string name="validFromSentence">Kelvollinen alkaen: <xliff:g>%s</xliff:g></string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -32,7 +32,6 @@
     <string name="exportFailed">Impossible d’effectuer l’exportation</string>
     <string name="importing">Import …</string>
     <string name="exporting">Export …</string>
-    <string name="noExternalStoragePermissionError">Accorder au stockage externe l’autorisation d’importer ou d’exporter des données</string>
     <string name="importOptionFilesystemTitle">Importer depuis le système de fichiers</string>
     <string name="importOptionFilesystemExplanation">Choisissez le fichier à importer.</string>
     <string name="importOptionFilesystemButton">Système de fichiers</string>
@@ -43,7 +42,6 @@
     <string name="app_license">Logiciel libre à copyleft, sous licence GPLv3+</string>
     <string name="about_title_fmt">À propos de <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version : <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Notes de version : <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Choisissez le code-barres</string>
     <string name="copy_to_clipboard_toast">Identifiant copié dans le presse-papiers</string>
     <string name="thumbnailDescription">Miniature</string>
@@ -99,13 +97,11 @@
     <string name="points">Points</string>
     <string name="currency">Devise</string>
     <string name="balance">Solde</string>
-    <string name="moveBarcodeToCenterOfScreen">Centrer le code-barres sur l’écran</string>
     <string name="moveBarcodeToTopOfScreen">Déplacez le code-barres vers le haut de l’écran</string>
     <string name="chooseExpiryDate">Choisissez la date d’expiration</string>
     <string name="never">Jamais</string>
     <string name="expiryDate">Date d’expiration</string>
     <string name="editBarcode">Modifier le code-barres</string>
-    <string name="barcode">Code-barres</string>
     <string name="card">Carte</string>
     <string name="balanceSentence">Solde : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Expiré : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
@@ -130,7 +126,6 @@
     <string name="setBarcodeId">Définir la valeur du code-barres</string>
     <string name="sameAsCardId">Identique à l’identifiant</string>
     <string name="barcodeId">Valeur du code-barres</string>
-    <string name="settings_max_font_size_scale">Taille max. de la police</string>
     <string name="unsupportedBarcodeType">Ce type de code-barres ne peut pas encore être affiché. Il sera peut-être pris en charge dans une version ultérieure de l’application.</string>
     <string name="wrongValueForBarcodeType">La valeur n’est pas valide pour le type de code-barres sélectionné</string>
     <string name="app_resources">Ressources tierces libres : <xliff:g id="app_resources_list">%s</xliff:g></string>
@@ -151,7 +146,7 @@
     <string name="backImageDescription">Image du verso</string>
     <string name="frontImageDescription">Image du recto</string>
     <string name="passwordRequired">Veuillez entrer le mot de passe</string>
-    <string name="importStocardMessage">Sélectionnez votre exportation <i>***-sync.zip</i> de Stocard pour l’importer.
+    <string name="importStocardMessage">Sélectionnez votre exportation <i>***.zip</i> de Stocard pour l’importer.
 \nVous pouvez l’obtenir en envoyant un courriel à support@stocardapp.com pour demander une exportation de vos données.</string>
     <string name="importStocard">Importer depuis Stocard</string>
     <string name="turn_flashlight_off">Éteindre la lampe de poche</string>
@@ -189,14 +184,12 @@
     <string name="app_contributors">Rendu possible par : <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="noGroupCards">Ce groupe est vide</string>
     <string name="barcodeImageDescriptionWithType">Image <xliff:g>%s</xliff:g> code-barres</string>
-    <string name="swipeToSwitchImages">Balayez pour changer d’image, maintenez appuyé pour ouvrir l’image dans la galerie</string>
     <string name="sort">Trier</string>
     <string name="sort_by">Trier par</string>
     <string name="reverse">… dans l’ordre inverse</string>
     <string name="sort_by_expiry">Date d’expiration</string>
     <string name="sort_by_most_recently_used">Les plus récemment utilisées</string>
     <string name="sort_by_name">Nom</string>
-    <string name="sort_by_balance">Solde</string>
     <string name="report_error">Signaler une erreur</string>
     <string name="on_google_play">sur Google Play</string>
     <string name="rate_this_app">Notez cette appli</string>
@@ -223,9 +216,7 @@
     <string name="shortcutSelectCard">Sélectionnez une carte</string>
     <string name="options">Options</string>
     <string name="starred">En favori</string>
-    <string name="set_scale">Définir une échelle</string>
     <string name="showMoreInfo">Afficher les infos</string>
-    <string name="hideMoreInfo">Masquer les infos</string>
     <plurals name="balancePoints">
         <item quantity="one"><xliff:g>%s</xliff:g> point</item>
         <item quantity="many"><xliff:g>%s</xliff:g> points</item>
@@ -270,4 +261,19 @@
     <string name="updateBalanceTitle">Combien avez-vous dépensé \?</string>
     <string name="newBalanceSentence">Nouveau solde : <xliff:g>%s</xliff:g></string>
     <string name="importCards">Importer des cartes</string>
+    <string name="storageReadPermissionRequired">L\'autorisation de lire le stockage est nécessaire pour cette action…</string>
+    <string name="cameraPermissionRequired">L\'autorisation d\'accéder à la caméra est nécessaire pour cette action…</string>
+    <string name="validFromDate">Valide à partir de</string>
+    <string name="validFromSentence">Valide à partir de : <xliff:g>%s</xliff:g></string>
+    <string name="anyDate">N’importe quelle date</string>
+    <string name="chooseValidFromDate">Choisissez la date de début de validité</string>
+    <string name="height">Hauteur :</string>
+    <string name="switchToFrontImage">Passer à l\'image avant</string>
+    <string name="switchToBackImage">Passer à l\'image arrière</string>
+    <string name="switchToBarcode">Passer au code barre</string>
+    <string name="openFrontImageInGalleryApp">Ouvrir l\'image avant dans l\'application galerie</string>
+    <string name="openBackImageInGalleryApp">Ouvrir l\'image arrière dans l\'application galerie</string>
+    <string name="setBarcodeHeight">Définir la hauteur du code-barres</string>
+    <string name="donate">Faire un don</string>
+    <string name="icon_header_click_text">Pressez longtemps pour éditer l\'icône</string>
 </resources>

app/src/main/res/values-hi/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="storeName">नाम</string>
     <string name="note">नोट</string>
     <string name="cardId">कार्ड आईडी</string>
@@ -63,7 +63,6 @@
     <string name="settings_landscape_orientation">आयत रूप(लैंडस्केप)</string>
     <string name="settings_follow_system_orientation">सिस्टम का पालन करें</string>
     <string name="settings_portrait_orientation">पोट्रैट</string>
-    <string name="settings_max_font_size_scale">अक्षर का अधिकतम नाप</string>
     <string name="settings_display_barcode_max_brightness">बारकोड का दृश्य उजालित(ब्राइट) करें</string>
     <string name="settings_keep_screen_on">स्क्रीन को चालू रखें</string>
     <string name="cameraPermissionDeniedTitle">हम कैमरा तक पहुँच नहीं सकते</string>
@@ -102,16 +101,49 @@
     <string name="leaveWithoutSaveTitle">निकास करें</string>
     <string name="addFromImage">गैलरी से चित्र चुनें</string>
     <string name="card">कार्ड</string>
-    <string name="barcode">बारकोड</string>
     <string name="editBarcode">बारकोड में बदलाव करें</string>
     <string name="expiryDate">समाप्ति दिन</string>
     <string name="never">कभी नहीं</string>
     <string name="chooseExpiryDate">समाप्ति दिन चुनें</string>
     <string name="moveBarcodeToTopOfScreen">बार कोड को स्क्रीन के ऊपरी भाग पर लाएं</string>
-    <string name="moveBarcodeToCenterOfScreen">बार कोड को स्क्रीन के बीच में लाएं</string>
     <string name="noBarcodeFound">कोई बारकोड नहीं पाया गया</string>
     <string name="errorReadingImage">चित्र को पढ़ना संभव नहीं हुआ</string>
     <string name="balance">संतुलन</string>
     <string name="currency">मुद्रा</string>
     <string name="accept">स्वीकार</string>
+    <string name="exportSuccessful">डेटा निर्यात किया गया</string>
+    <string name="groupsList">समूह: <xliff:g>%s</xliff:g></string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> अंक</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> अंक</item>
+    </plurals>
+    <string name="privacy_policy_popup_text">निजता नीति नोटिस (कुछ ऐप स्टोर के लिए आवश्यक):
+\n
+\nकोई भी डेटा एकत्र नहीं किया जाता है, जिसकी पुष्टि कोई भी कर सकता है क्योंकि हमारा ऐप मुफ्त सॉफ्टवेयर है।</string>
+    <string name="importCatimaMessage">आयात करने के लिए, <i>catima.zip</i> फाइल को चुने जो की Catima से निर्यात किया गया था.
+\nदूसरे Catima ऍप के आयात/निर्यात मेनू से निर्यात बटन दबाकर, पहले catima.zip फाइल को बनाये.</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> चयनित</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> चयनित.</item>
+    </plurals>
+    <string name="groups">समूहों</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">कॉपीराइट © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> कार्ड</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> कार्डों</item>
+    </plurals>
+    <string name="group_updated">समूह अपडेट किया गया</string>
+    <string name="failedOpeningFileManager">पहले एक फाइल मैनेजर इनस्टॉल करें.</string>
+    <string name="leaveWithoutSaveConfirmation">बिना सुरक्षित किये छोड़े\?</string>
+    <string name="addManually">मैन्युअली आई डी दर्ज करें</string>
+    <string name="editGroup">समूह संपादन: <xliff:g>%s</xliff:g></string>
+    <string name="points">अंक</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> एक वैध शेष राशि नहीं है.</string>
+    <string name="chooseImportType">यहाँ से डेटा का आयात करें</string>
+    <string name="privacy_policy">निजता नीति</string>
+    <string name="importCatima">कैटिमा से आयात करें</string>
+    <string name="app_license">कॉपीलेफ्ट लिबर सॉफ्टवेयर, GPLv3+ लाइसेंस प्राप्त</string>
+    <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g> के बारे में</string>
+    <string name="debug_version_fmt">संस्करण: <xliff:g id="version">%s</xliff:g></string>
+    <string name="copy_to_clipboard_toast">आई डी क्लिपबोर्ड पर कॉपी किया गया</string>
 </resources>

app/src/main/res/values-hr/strings.xml

@@ -1,83 +1,278 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="unstar">Ukloni iz favorita</string>
-    <string name="action_search">Pretraživanje</string>
+    <string name="action_search">Pretraži</string>
     <string name="save">Spremi</string>
     <string name="edit">Uredi</string>
     <string name="delete">Ukloni</string>
     <string name="confirm">Potvrdi</string>
-    <string name="deleteTitle">Ukloni kartu</string>
+    <string name="deleteTitle">Izbriši karticu</string>
     <string name="deleteConfirmation">Izbrisati ovu karticu zauvijek\?</string>
     <string name="copy_to_clipboard">Kopiraj ID u međuspremnik</string>
-    <string name="share">Podijeli</string>
-    <string name="sendLabel">Pošalji…</string>
+    <string name="share">Dijeli</string>
+    <string name="sendLabel">Pošalji …</string>
     <string name="editCardTitle">Uredi karticu</string>
-    <string name="addCardTitle">Dodaj Kartu</string>
-    <string name="scanCardBarcode">Skeniranje crtičnog koda kartice</string>
-    <string name="cardShortcut">Oznaka karte</string>
-    <string name="noCardsMessage">Najprije dodajte karticu</string>
-    <string name="card_ids_copied">Kopirani ID kartice</string>
+    <string name="addCardTitle">Dodaj karticu</string>
+    <string name="scanCardBarcode">Snimi crtični kod kartice</string>
+    <string name="cardShortcut">Prečac kartice</string>
+    <string name="noCardsMessage">Najprije dodaj karticu</string>
+    <string name="card_ids_copied">ID oznake su kopirane</string>
     <string name="noBarcode">Nema crtičnog koda</string>
     <string name="star">Dodaj u favorite</string>
     <string name="action_add">Dodaj</string>
     <string name="storeName">Ime</string>
     <string name="note">Napomena</string>
-    <string name="noMatchingGiftCards">Ništa nisam našao. Pokušajte promijeniti pretraživanje.</string>
+    <string name="noMatchingGiftCards">Nema rezultata. Pokušaj promijeniti pretragu.</string>
     <string name="cardId">ID kartice</string>
     <string name="barcodeType">Vrsta crtičnog koda</string>
-    <string name="barcodeNoBarcode">Na ovoj kartici nema crtičnog koda</string>
-    <string name="cancel">Poništi</string>
-    <string name="noGiftCards">Pritisnite gumb + plus da biste dodali karticu ili ga najprije uvezite iz izbornika ⋮.</string>
-    <string name="noStoreError">Ime nije uneseno</string>
-    <string name="noCardExistsError">Nije moguće pronaći karticu</string>
-    <string name="failedParsingImportUriError">Nije moguće analizirati uvoz URI</string>
-    <string name="importExport">Uvoz / Izvoz</string>
+    <string name="barcodeNoBarcode">Ne postoji crtični kod</string>
+    <string name="cancel">Odustani</string>
+    <string name="noGiftCards">Pritisni gumb + plus za dodavanje kartice ili uvezi putem izbornika ⋮.</string>
+    <string name="noStoreError">Ime nije zadano</string>
+    <string name="noCardExistsError">Nije bilo moguće pronaći tu karticu</string>
+    <string name="failedParsingImportUriError">Nije bilo moguće obraditi URI uvoza</string>
+    <string name="importExport">Uvoz/Izvoz</string>
     <string name="exportName">Izvoz</string>
-    <string name="importExportHelp">Sigurnosno kopiranje kartica omogućuje vam da ih premjestite na drugi uređaj.</string>
+    <string name="importExportHelp">Spremanje sigurnosnih kopija tvojih podataka omogućuje premještanje podataka na jedan drugi uređaj.</string>
     <string name="importSuccessfulTitle">Uvezeno</string>
-    <string name="importFailedTitle">Nije moguće uvesti</string>
-    <string name="importFailed">Nije moguće uvesti karte</string>
+    <string name="importFailedTitle">Neuspio uvoz</string>
+    <string name="importFailed">Nije bilo moguće izvršiti uvoz</string>
     <string name="exportSuccessfulTitle">Izvezeno</string>
-    <string name="about">Oh</string>
-    <string name="importOptionApplicationButton">Koristite drugu aplikaciju</string>
-    <string name="barcode">Barkod</string>
-    <string name="exportOptionExplanation">Podaci će biti zabilježeni na odabranom mjestu.</string>
-    <string name="exportFailedTitle">Izvoz nije uspio</string>
-    <string name="exporting">Opskrba…</string>
-    <string name="noExternalStoragePermissionError">Najprije odobrite dopuštenje za vanjsku pohranu za uvoz ili izvoz kartica</string>
-    <string name="importOptionFilesystemExplanation">Odaberite određenu datoteku iz datotečnog sustava.</string>
-    <string name="importOptionApplicationTitle">Koristite drugu aplikaciju</string>
+    <string name="about">Informacije</string>
+    <string name="importOptionApplicationButton">Koristi jednu drugu aplikaciju</string>
+    <string name="exportOptionExplanation">Podaci će se zapisati u željeno mjesto.</string>
+    <string name="exportFailedTitle">Neuspio izvoz</string>
+    <string name="exporting">Izvoz …</string>
+    <string name="importOptionFilesystemExplanation">Odaberi određenu datoteku iz datotečnog sustava.</string>
+    <string name="importOptionApplicationTitle">Koristi jednu drugu aplikaciju</string>
     <string name="settings">Postavke</string>
-    <string name="settings_dark_theme">Tamno</string>
-    <string name="exportFailed">Nije moguće izvesti karte</string>
-    <string name="importing">Uvoz…</string>
+    <string name="settings_dark_theme">Tamna</string>
+    <string name="exportFailed">Nije bilo moguće izvršiti izvoz</string>
+    <string name="importing">Uvoz …</string>
     <string name="importOptionFilesystemTitle">Uvoz iz datotečnog sustava</string>
     <string name="importOptionFilesystemButton">Iz datotečnog sustava</string>
-    <string name="importOptionApplicationExplanation">Koristite bilo koju aplikaciju ili omiljeni upravitelj datoteka za otvaranje datoteke.</string>
+    <string name="importOptionApplicationExplanation">Za otvaranje datoteke koristi bilo koju aplikaciju ili tvoj omiljeni upravljač datoteka.</string>
     <string name="settings_theme">Tema</string>
     <string name="settings_system_theme">Sustav</string>
-    <string name="settings_light_theme">Svjetlo</string>
-    <string name="settings_max_font_size_scale">Maksimalna veličina fonta</string>
-    <string name="settings_display_barcode_max_brightness">Osvijetlite izgled crtičnog koda</string>
-    <string name="moveDown">Pomicanje prema dolje</string>
-    <string name="addManually">Ručno unesite ID kartice</string>
-    <string name="thumbnailDescription">Sličica za karticu</string>
+    <string name="settings_light_theme">Svijetla</string>
+    <string name="settings_display_barcode_max_brightness">Osvijetli prikaz crtičnog koda</string>
+    <string name="moveDown">Pomakni prema dolje</string>
+    <string name="addManually">Ručno upiši ID</string>
+    <string name="thumbnailDescription">Sličica</string>
     <string name="starImage">Omiljena zvijezda</string>
     <string name="settings_category_title_ui">Korisničko sučelje</string>
-    <string name="exportSuccessful">Izvezeni podaci o karti</string>
-    <string name="settings_keep_screen_on">Držite zaslon uključen</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Spriječiti zaključavanje zaslona</string>
-    <string name="intent_import_card_from_url_share_text">Želim podijeliti razglednicu s vama</string>
-    <string name="importSuccessful">Uvezeni podaci o karti</string>
-    <string name="enter_group_name">Unesite naziv grupe</string>
+    <string name="exportSuccessful">Podaci su izvezeni</string>
+    <string name="settings_keep_screen_on">Ostavi ekran uključen</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Spriječi zaključavanje ekrana</string>
+    <string name="intent_import_card_from_url_share_text">Želim dijeliti karticu s tobom</string>
+    <string name="importSuccessful">Podaci su uvezeni</string>
+    <string name="enter_group_name">Upiši ime grupe</string>
     <string name="groups">Grupe</string>
-    <string name="noGroups">Pritisnite gumb + plus da biste najprije dodali grupe za klasifikaciju.</string>
-    <string name="noGroupCards">Ova grupa ne sadrži nikakve kartice</string>
-    <string name="addFromImage">Odaberite sliku iz galerije</string>
-    <string name="deleteConfirmationGroup">Izbriši grupu\?</string>
-    <string name="failedOpeningFileManager">Najprije instalirajte upravitelj datoteka.</string>
-    <string name="moveUp">Pomicanje gore</string>
-    <string name="leaveWithoutSaveTitle">Izlaz</string>
-    <string name="card">Karta</string>
-    <string name="leaveWithoutSaveConfirmation">Otići bez očuvanja\?</string>
+    <string name="noGroups">Pritisni gumb + plus za dodavanje grupe za kategoriziranje.</string>
+    <string name="noGroupCards">Ova je grupa prazna</string>
+    <string name="addFromImage">Odaberi sliku iz galerije</string>
+    <string name="deleteConfirmationGroup">Izbrisati grupu\?</string>
+    <string name="failedOpeningFileManager">Najprije instaliraj upravljač datoteka.</string>
+    <string name="moveUp">Pomakni prema gore</string>
+    <string name="leaveWithoutSaveTitle">Zatvori aplikaciju</string>
+    <string name="card">Kartica</string>
+    <string name="leaveWithoutSaveConfirmation">Zatvoriti aplikaciju bez spremanja\?</string>
+    <string name="noGiftCardsGroup">Stvori neke kartice, a zatim ih ovdje dodijeli grupi.</string>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> kartica</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> kartice</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kartica</item>
+    </plurals>
+    <string name="importStocardMessage">Odaberi tvoju iz Stocard izvezenu <i>***.zip</i> datoteku koju želiš uvesti.
+\nPošalji e-mail na support@stocardapp.com s molbom za izvoz tvojih podataka.</string>
+    <string name="translate_platform">na platformi Weblate</string>
+    <string name="editGroup">Uređivanje grupe: <xliff:g>%s</xliff:g></string>
+    <string name="editBarcode">Uredi crtični kod</string>
+    <string name="expiryDate">Datum isteka</string>
+    <string name="never">Nikada</string>
+    <string name="accept">Prihvati</string>
+    <string name="importCatima">Uvezi iz Catima</string>
+    <string name="importFidme">Uvezi iz FidMe</string>
+    <string name="importStocard">Uvezi iz Stocard</string>
+    <string name="importLoyaltyCardKeychainMessage">Odaberi tvoju iz LoyaltyCardKeychain izvezenu <i>LoyaltyCardKeychain.csv</i> datoteku koju želiš uvesti.
+\nStvori je putem izbornika „Uvoz/Izvoz” u aplikaciji LoyaltyCardKeychain i tamo najprije pritisni „Izvoz”.</string>
+    <string name="updateBarcodeQuestionText">Promijenio/la si ID. Želiš li također aktualizirati crtični kod da koristi istu vrijednost\?</string>
+    <string name="action_hide_details">Sakrij detalje</string>
+    <string name="importCards">Uvezi kartice</string>
+    <string name="selectColor">Odaberi boju</string>
+    <string name="setIcon">Postavi ikonu</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_green_theme">Zelena</string>
+    <string name="settings_grey_theme">Siva</string>
+    <string name="sort_by_expiry">Istek</string>
+    <string name="barcodeImageDescriptionWithType">Slika vrste crtičnog koda <xliff:g>%s</xliff:g></string>
+    <string name="noCardIdError">ID nije zadan</string>
+    <string name="importLoyaltyCardKeychain">Uvezi iz Loyalty Card Keychain</string>
+    <string name="frontImageDescription">Prednja slika</string>
+    <string name="exportPasswordHint">Upiši lozinku</string>
+    <string name="turn_flashlight_on">Uključi svjetiljku</string>
+    <string name="failedGeneratingShareURL">Nije bilo moguće generirati URL za dijeljenje. Prijavi ovaj problem.</string>
+    <string name="turn_flashlight_off">Isključi svjetiljku</string>
+    <string name="settings_locale">Jezik</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_violet_theme">Ljubičasta</string>
+    <string name="settings_sky_blue_theme">Nebesko plava</string>
+    <string name="sort">Razvrstaj</string>
+    <string name="updateBalance">Aktualiziraj saldo</string>
+    <string name="sort_by">Redoslijed</string>
+    <string name="version_history">Kronologija verzija</string>
+    <string name="credits">Zasluge</string>
+    <string name="and_data_usage">i korištenje podataka</string>
+    <string name="rate_this_app">Ocijeni ovu aplikaciju</string>
+    <string name="report_error">Prijavi greške</string>
+    <string name="include_if_asking_support">Ako želiš zatražiti podršku, uključi sljedeće informacije:</string>
+    <string name="options">Opcije</string>
+    <string name="starred">Označeno</string>
+    <string name="duplicateCard">Dupliciraj</string>
+    <string name="archive">Arhiviraj</string>
+    <string name="archived">Kartica je arhivirana</string>
+    <string name="unarchived">Kartica je dearhivirana</string>
+    <string name="failedLaunchingPhotoPicker">Nije bilo moguće pronaći aplikaciju za galeriju</string>
+    <string name="archiveList">Arhiva</string>
+    <string name="cameraPermissionDeniedTitle">Nije bilo moguće pristupiti kameri</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Za snimanje crtičnih kodova Catima treba pristup tvojoj kameri. Dodirni ovdje za mijenjanje postavki dozvola.</string>
+    <string name="app_libraries">Libre biblioteke trećih strana: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="selectBarcodeTitle">Biranje crtičnog koda</string>
+    <string name="copy_to_clipboard_toast">ID je kopiran u međuspremnik</string>
+    <string name="enterBarcodeInstructions">Upiši ID i dolje odaberi vrstu crtičnog koda ili „Ne postoji crtični kod”.</string>
+    <string name="settings_portrait_orientation">Okomito</string>
+    <string name="settings_lock_on_opening_orientation">Zaključaj na položaj koji se koristi prilikom otvaranja kartice</string>
+    <string name="group_edit">Uredi grupu</string>
+    <string name="group_name_already_in_use">Ime grupe se već koristi</string>
+    <string name="noBarcodeFound">Nijedan crtični kod nije pronađen</string>
+    <string name="balance">Saldo</string>
+    <string name="chooseImportType">Uvezi podatke iz</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="parsingBalanceFailed">Čini se da <xliff:g>%s</xliff:g> nije ispravni saldo.</string>
+    <string name="privacy_policy_popup_text">Obavijest o politici privatnosti (obavezna za neke trgovine aplikacija):
+\n
+\nPODACI SE UOPĆE NE PRIKUPLJAJU, što svatko može potvrditi budući da je naša aplikacija libre softver.</string>
+    <string name="importCatimaMessage">Odaberi tvoju iz Catima izvezenu <i>catima.zip</i> datoteku koju želiš uvesti.
+\nStvori je putem izbornika „Uvoz/Izvoz” jedne druge Catima aplikacije i tamo najprije pritisni „Izvoz”.</string>
+    <string name="height">Visina:</string>
+    <string name="switchToFrontImage">Prebaci na prednju sliku</string>
+    <string name="switchToBackImage">Prebaci na stražnju sliku</string>
+    <string name="switchToBarcode">Prebaci na crtični kod</string>
+    <string name="openFrontImageInGalleryApp">Otvori prednju sliku u aplikaciji galerije</string>
+    <string name="openBackImageInGalleryApp">Otvori stražnju sliku u aplikaciji galerije</string>
+    <string name="setBarcodeHeight">Postavi visinu crtičnog koda</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> odabrana</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> odabrane</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> odabrano</item>
+    </plurals>
+    <string name="validFromDate">Vrijedi od</string>
+    <string name="chooseValidFromDate">Odaberi datum od kada kartica vrijedi</string>
+    <string name="anyDate">Bilo koji datum</string>
+    <string name="validFromSentence">Vrijedi od: <xliff:g>%s</xliff:g></string>
+    <string name="photos">Slike</string>
+    <string name="ok">U redu</string>
+    <string name="app_copyright_old">Zasnovano na Loyalty Card Keychain
+\nautorsko pravo © 2016. – 2020. Branden Archer</string>
+    <string name="settings_system_locale">Sustav</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> bod</item>
+        <item quantity="few"><xliff:g>%s</xliff:g> boda</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> bodova</item>
+    </plurals>
+    <string name="donate">Doniraj</string>
+    <string name="storageReadPermissionRequired">Za ovu radnju je potrebna dozvola za čitanje spremljenih podataka …</string>
+    <string name="cameraPermissionRequired">Za ovu radnju je potrebna dozvola za pristup kameri …</string>
+    <string name="app_license">Copylefted libre softver, GPLv3+ licenca</string>
+    <string name="settings_card_orientation">Položaj crtičnog koda</string>
+    <string name="settings_follow_system_orientation">Slijedi sustav</string>
+    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
+    <string name="importFidmeMessage">Odaberi tvoju iz FidMe izvezenu <i>idme-export-request-xxxxxx.zip</i> datoteku koju želiš uvesti i ručno odaberi vste crtičnog koda nakon toga.
+\nStvori je putem tvog FidMe profila i tamo najprije odaberi „Zaštita podataka” a zatim pritisni „Dekomprimiraj moje podatke”.</string>
+    <string name="importVoucherVaultMessage">Odaberi tvoju iz Voucher Vault izvezenu <i>vouchervault.json</i> datoteku koju želiš uvesti.
+\nStvori je u aplikaciji Voucher Vault i tamo najprije pritisni „Izvoz”.</string>
+    <string name="settings_pink_theme">Ružičasta</string>
+    <string name="settings_blue_theme">Plava</string>
+    <string name="failedToRetrieveImageFile">Neuspjelo dohvaćanje slikovne datoteke</string>
+    <string name="license">Licenca</string>
+    <string name="barcodeLongPressMessage">U aplikaciji galerije se mogu otvoriiti samo slike</string>
+    <string name="source_repository">Izvorni repozitorij</string>
+    <string name="on_github">na GitHubu</string>
+    <string name="on_google_play">na stranici Google Play</string>
+    <string name="unarchive">Dearhiviraj</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> kartica (<xliff:g id="archivedCount">%2$d</xliff:g> arhivirana)</item>
+        <item quantity="few"><xliff:g>%1$d</xliff:g> kartice (<xliff:g id="archivedCount">%2$d</xliff:g> arhivirane)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> kartica (<xliff:g id="archivedCount">%2$d</xliff:g> arhivirano)</item>
+    </plurals>
+    <string name="help_translate_this_app">Pomogni prevoditi ovu aplikaciju</string>
+    <string name="welcome">Pozdrav u Catima</string>
+    <string name="currentBalanceSentence">Aktualni saldo: <xliff:g>%s</xliff:g></string>
+    <string name="newBalanceSentence">Novi saldo: <xliff:g>%s</xliff:g></string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Izbriši <xliff:g>%d</xliff:g> karticu</item>
+        <item quantity="few">Izbriši <xliff:g>%d</xliff:g> kartice</item>
+        <item quantity="other">Izbriši <xliff:g>%d</xliff:g> kartica</item>
+    </plurals>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Izbrisati ovu <xliff:g>%d</xliff:g> karticu zauvijek\?</item>
+        <item quantity="few">Izbrisati ove <xliff:g>%d</xliff:g> kartice zauvijek\?</item>
+        <item quantity="other">Izbrisati ovih <xliff:g>%d</xliff:g> kartica zauvijek\?</item>
+    </plurals>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019. – <xliff:g>%d.</xliff:g> Sylvia van Os</string>
+    <string name="debug_version_fmt">Verzija: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_resources">Libre resursi trećih strana: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="settings_landscape_orientation">Vodoravno</string>
+    <string name="group_name_is_empty">Ime grupe ne smije biti prazno</string>
+    <string name="group_updated">Grupa je aktualizirana</string>
+    <string name="all">Sve</string>
+    <string name="groupsList">Grupe: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Isteče: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Isteklo: <xliff:g>%s</xliff:g></string>
+    <string name="chooseExpiryDate">Odaberi datum isteka</string>
+    <string name="moveBarcodeToTopOfScreen">Premjesti crtični kod na vrh ekrana</string>
+    <string name="errorReadingImage">Nije bilo moguće učitati sliku</string>
+    <string name="currency">Valuta</string>
+    <string name="points">Bodovi</string>
+    <string name="privacy_policy">Politika privatnosti</string>
+    <string name="importVoucherVault">Uvezi iz Voucher Vault</string>
+    <string name="barcodeId">Vrijednost crtičnog koda</string>
+    <string name="sameAsCardId">Ista kao ID</string>
+    <string name="setBarcodeId">Postavi vrijednost crtičnog koda</string>
+    <string name="unsupportedBarcodeType">Ova se vrsta crtičnog koda još ne može prikazati. Možda će se podržati u novijoj verziji aplikacije.</string>
+    <string name="wrongValueForBarcodeType">Vrijednost nije valjana za odabranu vrstu crtičnog koda</string>
+    <string name="copy_to_clipboard_multiple_toast">ID oznke su kopirane u međuspremnik</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Želim dijeliti neke kartice s tobom</string>
+    <string name="backImageDescription">Stražnja slika</string>
+    <string name="setFrontImage">Postavi prednju sliku</string>
+    <string name="setBackImage">Postavi stražnju sliku</string>
+    <string name="removeImage">Ukloni sliku</string>
+    <string name="takePhoto">Uslikaj fotografiju</string>
+    <string name="updateBarcodeQuestionTitle">Aktualizirati vrijednost crtičnog koda\?</string>
+    <string name="yes">Da</string>
+    <string name="no">Ne</string>
+    <string name="passwordRequired">Upiši lozinku</string>
+    <string name="exportPassword">Postavi lozinku za zaštitu tvog izvoza (opcionalno)</string>
+    <string name="settings_oled_dark">Potpuno crna pozadina za tamnu temu</string>
+    <string name="settings_theme_color">Boja teme</string>
+    <string name="settings_brown_theme">Smeđa</string>
+    <string name="app_contributors">Omogućuje: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="showMoreInfo">Prikaži informacije</string>
+    <string name="sort_by_name">Ime</string>
+    <string name="sort_by_most_recently_used">Nedavno korišteno</string>
+    <string name="reverse">… u obrnutom redoslijedu</string>
+    <string name="action_show_details">Prikaži detalje</string>
+    <string name="shortcutSelectCard">Odaberi karticu</string>
+    <string name="noUnarchivedCardsMessage">Ne postoje nearhivirane kartice</string>
+    <string name="previousCard">Prethodna</string>
+    <string name="nextCard">Sljedeća</string>
+    <string name="updateBalanceTitle">Koliko si potrošio/la\?</string>
+    <string name="updateBalanceHint">Upiši iznos</string>
+    <string name="about_title_fmt">Informaije o <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="failedToOpenUrl">Najprije instaliraj web preglednik</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Pogledaj arhivu (<xliff:g>%1$d</xliff:g> kartica)</item>
+        <item quantity="few">Pogledaj arhivu (<xliff:g>%1$d</xliff:g> kartice)</item>
+        <item quantity="other">Pogledaj arhivu (<xliff:g>%1$d</xliff:g> kartica)</item>
+    </plurals>
 </resources>

app/src/main/res/values-hu/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
-    <string name="noGiftCards">Nyomja meg a + jelet a kártya hozzáadásához, vagy importáljon a ⋮ menüvel.</string>
+    <string name="noGiftCards">Kattintson a + plusz gombra egy kártya hozzáadásához, vagy importáljon a ⋮ menüből.</string>
     <string name="action_add">Hozzáadás</string>
     <string name="action_search">Keresés</string>
     <plurals name="selectedCardCount">
@@ -9,92 +9,90 @@
     </plurals>
     <string name="noCardsMessage">Először adjon hozzá egy kártyát</string>
     <string name="noGiftCardsGroup">Hozzon létre kártyákat, és rendelje hozzá a megfelelő csoporthoz.</string>
-    <string name="noMatchingGiftCards">Nincs eredmény. Próbálja módosítani a keresést.</string>
+    <string name="noMatchingGiftCards">Nincs találaat. Próbálja módosítani a keresést.</string>
     <string name="storeName">Név</string>
     <string name="note">Feljegyzés</string>
-    <string name="cardId">Kártya azonosító</string>
-    <string name="barcodeType">Vonalkód típus</string>
+    <string name="cardId">Kártyaazonosító</string>
+    <string name="barcodeType">Vonalkód típusa</string>
     <string name="barcodeNoBarcode">Nincs vonalkód</string>
     <string name="noBarcode">Nincs vonalkód</string>
-    <string name="star">Kedvencekhez adás</string>
-    <string name="unstar">Kivétel a kedvencek közül</string>
+    <string name="star">Hozzáadás a kedvencekhez</string>
+    <string name="unstar">Eltávolítás a kedvencekből</string>
     <string name="cancel">Mégse</string>
     <string name="save">Mentés</string>
     <string name="edit">Szerkesztés</string>
     <string name="delete">Törlés</string>
-    <string name="confirm">Alkalmaz</string>
+    <string name="confirm">Jóváhagyás</string>
     <plurals name="deleteCardsTitle">
-        <item quantity="one"><xliff:g>%d</xliff:g> törlése</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> törlése</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> kártya törlése</item>
+        <item quantity="other">Törölje az <xliff:g>%d</xliff:g> kártyákat</item>
     </plurals>
     <string name="deleteConfirmation">Véglegesen törli a kártyát\?</string>
     <string name="ok">Rendben</string>
-    <string name="copy_to_clipboard">Azonosító másolása a vágólapra</string>
+    <string name="copy_to_clipboard">Azonosító vágólapra másolása</string>
     <string name="share">Megosztás</string>
     <string name="sendLabel">Küldés…</string>
     <string name="editCardTitle">Kártya szerkesztése</string>
     <string name="addCardTitle">Kártya hozzáadása</string>
-    <string name="scanCardBarcode">Vonalkód szkennelése</string>
+    <string name="scanCardBarcode">Vonalkód leolvasása</string>
     <string name="cardShortcut">Kártya parancsikon</string>
     <string name="noStoreError">Nincs név megadva</string>
-    <string name="failedParsingImportUriError">Nem elemezhető az importált URI</string>
-    <string name="importExport">Import/Export</string>
-    <string name="exportName">Export</string>
-    <string name="importExportHelp">Az adataid mentése lehetővé teszi, hogy egy másik eszközre feltöltsd.</string>
+    <string name="failedParsingImportUriError">Az importálási URI nem értelmezhető</string>
+    <string name="importExport">Importálás/exportálás</string>
+    <string name="exportName">Exportálás</string>
+    <string name="importExportHelp">Az adatok mentése lehetővé teszi, hogy egy másik eszközre helyezze át.</string>
     <string name="importSuccessfulTitle">Importálva</string>
-    <string name="importFailedTitle">Importálás meghiúsult</string>
-    <string name="importFailed">Importálás nem hajtható végre</string>
+    <string name="importFailedTitle">Az importálás sikertelen</string>
+    <string name="importFailed">Nem sikerült az importálás végrehajtása</string>
     <string name="exportSuccessfulTitle">Exportálva</string>
-    <string name="exportFailedTitle">Exportálás meghiúsult</string>
+    <string name="exportFailedTitle">Az exportálás sikertelen</string>
     <plurals name="deleteCardsConfirmation">
-        <item quantity="one">Véglegesen törli a <xliff:g>%d</xliff:g> kártyát\?</item>
-        <item quantity="other">Véglegesen törli a <xliff:g>%d</xliff:g> kártyákat\?</item>
+        <item quantity="one">Véglegesen töröl <xliff:g>%d</xliff:g> kártyát\?</item>
+        <item quantity="other">Véglegesen töröl <xliff:g>%d</xliff:g> kártyát\?</item>
     </plurals>
     <string name="deleteTitle">Kártya törlése</string>
-    <string name="card_ids_copied">Azonosító(k) másolása</string>
-    <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> vonalkód képe</string>
+    <string name="card_ids_copied">Azonosító(k) másolva</string>
+    <string name="barcodeImageDescriptionWithType">A(z) <xliff:g>%s</xliff:g> vonalkód képe</string>
     <string name="noCardIdError">Nincs azonosító megadva</string>
-    <string name="noCardExistsError">Kártya nem található</string>
-    <string name="importStocardMessage">Válassza ki a <i>***-sync.zip</i> Stocard exportot.
-\nAdatinak exportját kérheti e-mailben a support@stocardapp.com címre írva.</string>
-    <string name="importVoucherVault">Importálás Voucher Vault-ból</string>
-    <string name="wrongValueForBarcodeType">Ez az érték meg megfelelő a vonalkód típushoz</string>
+    <string name="noCardExistsError">A kártya nem található</string>
+    <string name="importStocardMessage">Válassza ki az importálandó <i>***.zip</i> Stocard export fájlt.
+\nAz adatainak exportálását a support@stocardapp.com címre írt levélben kérheti.</string>
+    <string name="importVoucherVault">Importálás a Voucher Vaultból</string>
+    <string name="wrongValueForBarcodeType">Ez az érték meg megfelelő a kiválasztott vonalkódtípushoz</string>
     <string name="settings_green_theme">Zöld</string>
     <string name="setBackImage">Hátlapi kép beállítása</string>
     <string name="no">Nem</string>
-    <string name="passwordRequired">Kérem írja be a kódot</string>
+    <string name="passwordRequired">Adja meg a jelszót</string>
     <string name="settings_catima_theme">Catima</string>
     <string name="exportPasswordHint">Kód beírása</string>
-    <string name="failedGeneratingShareURL">Nem lehetett megosztható címet generálni. Kérem jelentse ezt.</string>
+    <string name="failedGeneratingShareURL">Nem lehetett megosztható webcímet előállítani. Kérjük, ezt jelentse.</string>
     <string name="settings_theme_color">Téma színe</string>
     <string name="settings_grey_theme">Szürke</string>
-    <string name="sort">Rendez</string>
-    <string name="on_google_play">Google Play-en</string>
-    <string name="action_show_details">Részletek mutatása</string>
+    <string name="sort">Rendezés</string>
+    <string name="on_google_play">a Google Playen</string>
+    <string name="action_show_details">Részletek megjelenítése</string>
     <string name="action_hide_details">Részletek elrejtése</string>
-    <string name="and_data_usage">és adat használat</string>
-    <string name="translate_platform">Weblate-en</string>
+    <string name="and_data_usage">és adathasználat</string>
+    <string name="translate_platform">a Weblate-en</string>
     <string name="sort_by_name">Név</string>
     <string name="sort_by_most_recently_used">Legutóbb használt</string>
     <string name="sort_by_expiry">Lejárat</string>
-    <string name="rate_this_app">Értékelje az appot</string>
-    <string name="exportFailed">Exportálás sikertelen</string>
+    <string name="rate_this_app">Értékelje az alkalmazást</string>
+    <string name="exportFailed">Nem sikerült az exportálás végrehajtása</string>
     <string name="importing">Importálás…</string>
     <string name="exporting">Exportálás…</string>
-    <string name="noExternalStoragePermissionError">Külső háttértárhoz való hozzáférés engedélyezése adat import vagy export miatt</string>
-    <string name="exportOptionExplanation">Az adatokat a kiválasztott helyre fogjuk menteni.</string>
+    <string name="exportOptionExplanation">Az adatok a kiválasztott helyre lesznek mentve.</string>
     <string name="importOptionFilesystemTitle">Importálás fájlrendszerből</string>
     <string name="importOptionFilesystemButton">A fájlrendszerből</string>
-    <string name="importOptionApplicationTitle">Másik app használata</string>
-    <string name="importOptionApplicationExplanation">Használjon egy tetszőleges appot, vagy kedvenc fájl menedzserét a fájl megnyitásához.</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Szerzői Jog © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
-    <string name="app_license">Copyleft-elt gáttalan szoftver, GPLv3+ licenszelve</string>
-    <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g> névjegye</string>
+    <string name="importOptionApplicationTitle">Másik alkalmazás használata</string>
+    <string name="importOptionApplicationExplanation">A fájl megnyitásához használjon egy tetszőleges alkalmazást, vagy a kedvenc fájlkezelőjét.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_license">Copyleft licencű szabad szoftver, GPLv3+ alatt közzétéve</string>
+    <string name="about_title_fmt">A <xliff:g id="app_name">%s</xliff:g> névjegye</string>
     <string name="debug_version_fmt">Verzió: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Revíziós információ: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_resources">Gáttalan külsős források: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_resources">Szabad külső erőforrások: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Vonalkód kiválasztása</string>
-    <string name="enterBarcodeInstructions">Írja be az azonosítót, majd válasszon egy vonalkódot, vagy a \"Nincs vonalkód\" opciót.</string>
+    <string name="enterBarcodeInstructions">Írja be az azonosítót, majd válasszon egy vonalkódot, vagy a „Nincs vonalkód” lehetőséget.</string>
     <string name="copy_to_clipboard_toast">Azonosító vágólapra másolva</string>
     <string name="starImage">Kedvencek csillag</string>
     <string name="settings">Beállítások</string>
@@ -102,57 +100,54 @@
     <string name="settings_theme">Téma</string>
     <string name="settings_system_theme">Rendszer</string>
     <string name="settings_light_theme">Világos</string>
-    <string name="settings_max_font_size_scale">Max. betű méret</string>
-    <string name="settings_display_barcode_max_brightness">Fényes vonalkód nézet</string>
-    <string name="settings_keep_screen_on">Képernyő bekapcsolva marad</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Képernyő zárólás megakadályozása</string>
+    <string name="settings_display_barcode_max_brightness">Vonalkód nézet világosítása</string>
+    <string name="settings_keep_screen_on">A képernyő bekapcsolva tartása</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Képernyőzárólás megakadályozása</string>
     <string name="intent_import_card_from_url_share_text">Meg akarok veled osztani egy kártyát</string>
-    <string name="importSuccessful">Adat importálva</string>
-    <string name="exportSuccessful">Adat exportálva</string>
+    <string name="importSuccessful">Adatok importálva</string>
+    <string name="exportSuccessful">Adatok exportálva</string>
     <string name="enter_group_name">Adja meg a csoport nevét</string>
     <string name="groups">Csoportok</string>
     <string name="group_edit">Csoport szerkesztése</string>
-    <string name="group_name_is_empty">Csoport név nem lehet üres</string>
-    <string name="failedOpeningFileManager">Telepítsen egy fájl menedzsert.</string>
-    <string name="moveUp">Felfelé mozgatás</string>
-    <string name="moveDown">Lefelé mozgatás</string>
+    <string name="group_name_is_empty">A csoportnév nem lehet üres</string>
+    <string name="failedOpeningFileManager">Előbb telepítsen egy fájlkezelőt.</string>
+    <string name="moveUp">Mozgatás felfelé</string>
+    <string name="moveDown">Mozgatás lefelé</string>
     <string name="leaveWithoutSaveTitle">Kilépés</string>
     <string name="leaveWithoutSaveConfirmation">Kilépés mentés nélkül\?</string>
-    <string name="addManually">Azonosító manuális beírása</string>
+    <string name="addManually">Azonosító kézi beírása</string>
     <string name="addFromImage">Kép kiválasztása a galériából</string>
     <string name="editGroup">Csoportok szerkesztése: <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentence">Érvényes: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Lejárat: <xliff:g>%s</xliff:g></string>
     <string name="balanceSentence">Egyenleg: <xliff:g>%s</xliff:g></string>
     <string name="card">Kártya</string>
-    <string name="barcode">Vonalkód</string>
     <string name="editBarcode">Vonalkód szerkesztése</string>
     <string name="expiryDate">Lejárati dátum</string>
     <string name="never">Soha</string>
     <string name="chooseExpiryDate">Lejárati dátum kiválasztása</string>
     <string name="moveBarcodeToTopOfScreen">Vonalkód feltolása a képernyő tetejére</string>
-    <string name="moveBarcodeToCenterOfScreen">Vonalkód középre igazítása</string>
     <string name="noBarcodeFound">Nem található vonalkód</string>
     <string name="errorReadingImage">Nem lehet olvasni a képet</string>
     <string name="balance">Egyenleg</string>
-    <string name="currency">Valuta</string>
+    <string name="currency">Pénznem</string>
     <string name="points">Pontok</string>
-    <string name="parsingBalanceFailed">A <xliff:g>%s</xliff:g> nem tűnik valós egyenlegnek.</string>
-    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="privacy_policy">Adatvédelmi Szabályzat</string>
-    <string name="accept">Elfogad</string>
-    <string name="importCatima">Importálás Catimából</string>
-    <string name="importFidme">Importálás FidMe-ből</string>
-    <string name="importLoyaltyCardKeychain">Importálás a Loyalty Card Keychain-ből</string>
-    <string name="importLoyaltyCardKeychainMessage">Válassza ki a Loyalty Card Keychain-ból importálni kívánt <i>LoyaltyCardKeychain.csv</i> export fájlt.
-\nLétrehozhatja az Import/Export menüből ha a Loyalty Card Keychain-ben rányom az Exportra.</string>
-    <string name="importStocard">Importálás Stocard-ból</string>
-    <string name="importVoucherVaultMessage">Válassza ki a <i>vouchervault.json</i> Voucher Vault exportját.
-\nLétrehozhatja az Export-ra nyomva a Voucher Vault-ban.</string>
-    <string name="barcodeId">Vonalkód érték</string>
+    <string name="parsingBalanceFailed">A(z) <xliff:g>%s</xliff:g> nem tűnik valós egyenlegnek.</string>
+    <string name="app_loyalty_card_keychain">Hűségkártya-kulcstartó</string>
+    <string name="privacy_policy">Adatvédelmi irányelvek</string>
+    <string name="accept">Elfogadás</string>
+    <string name="importCatima">Importálás a Catimából</string>
+    <string name="importFidme">Importálás a FidMeből</string>
+    <string name="importLoyaltyCardKeychain">Importálás a Loyalty Card Keychainből</string>
+    <string name="importLoyaltyCardKeychainMessage">Válassza ki a Loyalty Card Keychainből importálandó <i>LoyaltyCardKeychain.csv</i> export fájlt.
+\nEzt hozza létre a Loyalty Card Keychainben az Importálás/exportálás menüben, az Exportálás megnyomásával.</string>
+    <string name="importStocard">Importálás a Stocardból</string>
+    <string name="importVoucherVaultMessage">Válassza ki az importálandó <i>vouchervault.json</i> Voucher Vault export fájlt.
+\nEzt hozza létre a Voucher Vaultban az Exportálás megnyomásával.</string>
+    <string name="barcodeId">Vonalkód értéke</string>
     <string name="sameAsCardId">Ugyanaz, mint az azonosító</string>
-    <string name="setBarcodeId">Vonalkód érték beállítása</string>
-    <string name="unsupportedBarcodeType">Ez a vonalkód típus még nem megjeleníthető. Feltehetően támogatva lesz egy későbbi verzióban.</string>
-    <string name="copy_to_clipboard_multiple_toast">Azonosítók a vágólapra másolva</string>
+    <string name="setBarcodeId">Vonalkód értékének beállítása</string>
+    <string name="unsupportedBarcodeType">Ez a vonalkódtípus még nem jeleníthető meg. Lehet, hogy támogatott lesz az alkalmazás egy későbbi verziójában.</string>
+    <string name="copy_to_clipboard_multiple_toast">Az azonosítók a vágólapra másolva</string>
     <string name="intent_import_card_from_url_share_multiple_text">Meg akarok veled osztani pár kártyát</string>
     <string name="frontImageDescription">Előlapi kép</string>
     <string name="backImageDescription">Hátlapi kép</string>
@@ -160,10 +155,10 @@
     <string name="setFrontImage">Előlapi kép beállítása</string>
     <string name="removeImage">Kép eltávolítása</string>
     <string name="takePhoto">Fénykép készítése</string>
-    <string name="updateBarcodeQuestionTitle">Vonalkód érték frissítése\?</string>
-    <string name="updateBarcodeQuestionText">Megváltoztatta az azonosító. Meg akarja ennek megfelelően változtatni a vonalkód értéket is\?</string>
+    <string name="updateBarcodeQuestionTitle">Vonalkódérték frissítése\?</string>
+    <string name="updateBarcodeQuestionText">Megváltoztatta az azonosítót. Ennek megfelelően megváltoztatja a vonalkód értéket is\?</string>
     <string name="yes">Igen</string>
-    <string name="exportPassword">Írjon be egy jelszót az export védelme érdekében (opcionális)</string>
+    <string name="exportPassword">Állítson be egy jelszót az export védelme érdekében (nem kötelező)</string>
     <string name="turn_flashlight_on">Zseblámpa bekapcsolása</string>
     <string name="turn_flashlight_off">Zseblámpa kikapcsolása</string>
     <string name="settings_locale">Nyelv</string>
@@ -171,80 +166,107 @@
     <string name="selectColor">Szín kiválasztása</string>
     <string name="setIcon">Ikon beállítása</string>
     <string name="settings_pink_theme">Rózsaszín</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_violet_theme">Ibolyaszínű</string>
+    <string name="settings_magenta_theme">Bíbor</string>
+    <string name="settings_violet_theme">Ibolya</string>
     <string name="settings_blue_theme">Kék</string>
     <string name="settings_sky_blue_theme">Égszínkék</string>
     <string name="settings_brown_theme">Barna</string>
-    <string name="app_contributors">Lehetővé tette: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="showMoreInfo">Infó mutatása</string>
-    <string name="hideMoreInfo">Infó elrejtése</string>
-    <string name="swipeToSwitchImages">Húzza oldalra vagy tartsa nyomva a kép megváltoztatásáért</string>
-    <string name="sort_by_balance">Egyenleg</string>
-    <string name="reverse">...fordított sorrendben</string>
-    <string name="sort_by">Rendezés mint</string>
-    <string name="version_history">Verzió történet</string>
+    <string name="app_contributors">Lehetővé tették: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="showMoreInfo">Információk megjelenítése</string>
+    <string name="reverse">…fordított sorrendben</string>
+    <string name="sort_by">Rendezés:</string>
+    <string name="version_history">Verziótörténet</string>
     <string name="credits">Köszönet</string>
-    <string name="help_translate_this_app">Segítsen lefordítani az appot</string>
-    <string name="license">Licensz</string>
-    <string name="source_repository">Forrás repó</string>
-    <string name="on_github">GitBub-on</string>
-    <string name="report_error">Hiba Jelentése</string>
+    <string name="help_translate_this_app">Segítsen lefordítani az alkalmazást</string>
+    <string name="license">Licenc</string>
+    <string name="source_repository">Forráskódtároló</string>
+    <string name="on_github">a GitHubon</string>
+    <string name="report_error">Hiba jelentése</string>
     <string name="shortcutSelectCard">Válasszon egy kártyát</string>
     <string name="options">Beállítások</string>
     <string name="starred">Csillagozva</string>
-    <string name="set_scale">Méret választása</string>
     <plurals name="groupCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> kártya</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> kártyák</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kártya</item>
     </plurals>
     <plurals name="balancePoints">
         <item quantity="one"><xliff:g>%s</xliff:g> pont</item>
-        <item quantity="other"><xliff:g>%s</xliff:g> pont</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> pontok</item>
     </plurals>
-    <string name="chooseImportType">Adat importálása innen</string>
+    <string name="chooseImportType">Adatok importálása innen</string>
     <string name="thumbnailDescription">Előkép</string>
     <string name="importOptionFilesystemExplanation">Válassza ki a kívánt fájlt a fájlrendszerből.</string>
-    <string name="importOptionApplicationButton">Másik app használata</string>
+    <string name="importOptionApplicationButton">Másik alkalmazás használata</string>
     <string name="about">Névjegy</string>
     <string name="app_copyright_old">Készült a Loyalty Card Keychain alapján
-\nszerzői jog © 2016–2020 Branden Archer</string>
-    <string name="app_libraries">Gáttalan külsős mappák: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+\nCopyright © 2016–2020 Branden Archer</string>
+    <string name="app_libraries">Szabad külső programkönyvtárak: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="settings_dark_theme">Sötét</string>
     <string name="deleteConfirmationGroup">Csoport törlése\?</string>
     <string name="noGroups">Nyomja meg a + gombot a csoportok kategorizálásához.</string>
-    <string name="group_name_already_in_use">Csoport név már létezik</string>
-    <string name="all">Mind</string>
+    <string name="group_name_already_in_use">A csoportnév már létezik</string>
+    <string name="all">Összes</string>
     <string name="noGroupCards">Ez a csoport üres</string>
     <string name="group_updated">Csoport frissítve</string>
     <string name="expiryStateSentenceExpired">Lejárt: <xliff:g>%s</xliff:g></string>
     <string name="groupsList">Csoportok: <xliff:g>%s</xliff:g></string>
-    <string name="importCatimaMessage">Válassza ki a <i>catima.zip</i>-jét az importáláshoz.
-\nLétrehozhatja az Import/Export menüből az Exportálást megnyomva egy másik Catima appban.</string>
-    <string name="privacy_policy_popup_text">Adatvédelmi szabály értesítő (némely app bolt kéri):
+    <string name="importCatimaMessage">Válassza ki az exportált <i>catima.zip</i> fájlt az importáláshoz.
+\nLétrehozhatja az Importálás/exportálás menüből az Exportálást megnyomva egy másik Catima alkalmazásban.</string>
+    <string name="privacy_policy_popup_text">Adatvédelmi irányelvek nyilatkozata (némely alkalmazásbolt kéri):
 \n
-\nSEMMILYEN ADATGYŰJTÉS NINCS, amit bárki ellenőrizhet, lévén hogy az app gáttalan szoftver.</string>
-    <string name="importFidmeMessage">Válassza ki a <i>fidme-export-request-xxxxxx.zip</i> nevű FidMe exportot, majd importálja be és válassza a manuális vonalkód opciót utána.
-\nEzt a FidMe-ben megtalálja a profiljában az Adat Védelem résznél ha rányom az Adataim Kivonata linkre.</string>
-    <string name="settings_card_orientation">Vonalkód tájolás</string>
+\nSEMMILYEN ADAT NEM KERÜL GYŰJTÉSRE, amit bárki ellenőrizhet, hiszen az alkalmazás szabad szoftver.</string>
+    <string name="importFidmeMessage">Válassza ki a FidMeből exportált <i>fidme-export-request-xxxxxx.zip</i> fájl majd importálja be, és utána válassza a kézi vonalkódbeírást.
+\nEzt hozza létre a FidMe-profiljában az Adatvédelem rész választásával, majd a Saját adatok kinyerése megnyomásával.</string>
+    <string name="settings_card_orientation">Vonalkód tájolása</string>
     <plurals name="groupCardCountWithArchived">
         <item quantity="one"><xliff:g>%1$d</xliff:g> kártya (<xliff:g id="archivedCount">%2$d</xliff:g> archiválva)</item>
-        <item quantity="other"><xliff:g>%1$d</xliff:g> kártyák (<xliff:g id="archivedCount">%2$d</xliff:g> archiválva)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> kártya (<xliff:g id="archivedCount">%2$d</xliff:g> archiválva)</item>
     </plurals>
     <string name="noUnarchivedCardsMessage">Nincs archiválatlan kártya</string>
-    <string name="failedToOpenUrl">Először telepíts egy webböngészőt</string>
-    <string name="failedLaunchingPhotoPicker">Nem található támogatott képnézegető app</string>
+    <string name="failedToOpenUrl">Először telepítsen egy webböngészőt</string>
+    <string name="failedLaunchingPhotoPicker">Nem található támogatott galéria alkalmazás</string>
     <string name="previousCard">Előző</string>
     <string name="nextCard">Következő</string>
     <string name="settings_portrait_orientation">Álló</string>
     <string name="settings_follow_system_orientation">Rendszer követése</string>
-    <string name="settings_lock_on_opening_orientation">A használt tájolás zárolása kártya használatakor</string>
+    <string name="settings_lock_on_opening_orientation">A használt tájolás zárolása a kártya megnyitásakor</string>
     <string name="settings_landscape_orientation">Fekvő</string>
-    <string name="settings_oled_dark">Tiszta fekete háttér sötét témánál</string>
-    <string name="include_if_asking_support">Ha támogatást szeretnél igénybe venni, oszd meg az alábbi információkat:</string>
-    <string name="archive">Archivál</string>
+    <string name="settings_oled_dark">Teljesen fekete háttér a sötét témánál</string>
+    <string name="include_if_asking_support">Ha támogatás akar kérni, ossza meg az alábbi információkat:</string>
+    <string name="archive">Archiválás</string>
     <string name="unarchive">Archiválás megszüntetése</string>
-    <string name="archived">Kártya archiválása</string>
-    <string name="archiveList">Archivál</string>
-    <string name="duplicateCard">Másolat</string>
+    <string name="archived">Kártya archiválva</string>
+    <string name="archiveList">Archívum</string>
+    <string name="duplicateCard">Klónozás</string>
+    <string name="currentBalanceSentence">Jelenlegi egyenleg: <xliff:g>%s</xliff:g></string>
+    <string name="updateBalanceHint">Adja meg az összeget</string>
+    <string name="importCards">Kártyák importálása</string>
+    <string name="updateBalanceTitle">Mennyit költött\?</string>
+    <string name="newBalanceSentence">Új egyenleg: <xliff:g>%s</xliff:g></string>
+    <string name="cameraPermissionDeniedTitle">Nem sikerült hozzáférni a kamerához</string>
+    <string name="failedToRetrieveImageFile">Nem sikerült lekérni a képfájlt</string>
+    <string name="barcodeLongPressMessage">Csak képek nyithatók meg a galéria alkalmazásban</string>
+    <string name="unarchived">Kártya archiválása megszüntetve</string>
+    <string name="welcome">Üdvözöljük a Catimában</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Archívum megtekintése (<xliff:g>%1$d</xliff:g> kártya)</item>
+        <item quantity="other">Archívum megtekintése (<xliff:g>%1$d</xliff:g> kártya)</item>
+    </plurals>
+    <string name="updateBalance">Egyenleg frissítése</string>
+    <string name="noCameraPermissionDirectToSystemSetting">A vonalkódok leolvasásához a Catimának hozzá kell férnie a kamerához. Koppintson ide az engedélybeállítások módosításához.</string>
+    <string name="validFromDate">Érvényesség kezdete</string>
+    <string name="anyDate">Bármely dátum</string>
+    <string name="chooseValidFromDate">Válassza ki az érvényesség kezdetét</string>
+    <string name="validFromSentence">Érvényesség kezdete: <xliff:g>%s</xliff:g></string>
+    <string name="storageReadPermissionRequired">A művelethez tárolóolvasási engedély szükséges…</string>
+    <string name="cameraPermissionRequired">A művelethez a kamera-hozzáférési engedély szükséges…</string>
+    <string name="height">Magasság:</string>
+    <string name="switchToFrontImage">Elölnézeti képre váltás</string>
+    <string name="switchToBackImage">Hátulnézeti képre váltás</string>
+    <string name="switchToBarcode">Vonalkódra váltás</string>
+    <string name="donate">Adományozás</string>
+    <string name="openBackImageInGalleryApp">Hátulnézeti kép megnyitása a galéria alkalmazásban</string>
+    <string name="openFrontImageInGalleryApp">Elölnézeti kép megnyitása a galéria alkalmazásban</string>
+    <string name="setBarcodeHeight">Vonalkód magasságának megadása</string>
+    <string name="icon_header_click_text">Hosszú nyomás az ikon szerkesztéséhez</string>
 </resources>

app/src/main/res/values-in-rID/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
-    <string name="app_revision_url">https://github.com/CatimaLoyalty/Android/releases</string>
     <string name="storeName">Nama</string>
     <string name="note">Keterangan</string>
     <string name="delete">Hapus</string>
@@ -14,7 +13,6 @@
     <string name="action_add">Tambah</string>
     <string name="action_search">Cari</string>
     <string name="sort_by_name">Nama</string>
-    <string name="sort_by_balance">Saldo</string>
     <string name="sort_by">Sortir dengan</string>
     <string name="sort">Urut</string>
     <string name="credits">Kredit</string>
@@ -36,7 +34,6 @@
     <string name="all">Semua</string>
     <string name="leaveWithoutSaveTitle">Keluar</string>
     <string name="card">Kartu</string>
-    <string name="barcode">Barcode</string>
     <string name="chooseExpiryDate">Pilih masa berlaku</string>
     <string name="noBarcodeFound">Barcode tidak ditemukan</string>
     <string name="errorReadingImage">Tidak dapat membaca gambar</string>
@@ -96,7 +93,6 @@
     <string name="exportFailed">Tidak dapat mengekspor</string>
     <string name="importing">Sedang mengimpor…</string>
     <string name="exporting">Sedang mengekspor…</string>
-    <string name="noExternalStoragePermissionError">Berikan izin penyimpanan eksternal untuk mengimpor atau mengekspor data</string>
     <string name="exportOptionExplanation">Data akan ditulis ke lokasi pilihan Anda.</string>
     <string name="importOptionFilesystemTitle">Impor dari pengelola file bawaan</string>
     <string name="importOptionFilesystemExplanation">Pilih file dari pengelola file bawaan.</string>
@@ -111,7 +107,6 @@
     <string name="app_license">Perangkat lunak bebas copyleft, berlisensi GPLv3+</string>
     <string name="about_title_fmt">Tentang <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versi: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Info Revisi: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_libraries">Pustaka pihak ketiga gratis: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources">Sumber daya pihak ketiga gratis: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="enterBarcodeInstructions">Masukkan ID, dan pilih jenis barcode di bawah ini, atau \"Tidak ada barcode\".</string>
@@ -120,7 +115,6 @@
     <string name="starImage">Favorit</string>
     <string name="settings_light_theme">Terang</string>
     <string name="settings_dark_theme">Gelap</string>
-    <string name="settings_max_font_size_scale">Ukuran maksimal huruf</string>
     <string name="settings_display_barcode_max_brightness">Terangkan tampilan barcode</string>
     <string name="settings_keep_screen_on">Biarkan layar menyala</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Cegah kunci layar</string>
@@ -146,10 +140,9 @@
     <string name="expiryDate">Tanggal masa berlaku</string>
     <string name="never">Tidak pernah</string>
     <string name="moveBarcodeToTopOfScreen">Pindah barcode ke bagian paling depan</string>
-    <string name="moveBarcodeToCenterOfScreen">Pusatkan barcode pada layar</string>
     <string name="points">Poin</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> sepertinya bukan saldo yang valid.</string>
-    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="app_loyalty_card_keychain">Gantungan kunci kartu kesetiaan</string>
     <string name="privacy_policy">Kebijakan Privasi</string>
     <string name="privacy_policy_popup_text">Pemberitahuan kebijakan privasi (diperlukan oleh beberapa toko aplikasi): 
 \n
@@ -162,7 +155,7 @@
     <string name="importLoyaltyCardKeychainMessage">Pilih ekspor <i>LoyaltyCardKeychain.csv</i> Anda dari Loyalty Card Keychain untuk diimpor. 
 \nBuat dari menu Import/Export di Loyalty Card Keychain dengan menekan Export terlebih dahulu.</string>
     <string name="importStocard">Impor dari Stocard</string>
-    <string name="importStocardMessage">Pilih ekspor <i>***-sync.zip</i> Anda dari Stocard untuk diimpor. 
+    <string name="importStocardMessage">Pilih ekspor <i>***.zip</i> Anda dari Stocard untuk diimpor. 
 \nDapatkan dengan mengirim email ke support@stocardapp.com untuk meminta ekspor data Anda.</string>
     <string name="importVoucherVault">Impor dari Voucher Vault</string>
     <string name="importVoucherVaultMessage">Pilih ekspor <i>vouchervault.json</i> Anda dari Vault Voucher untuk diimpor. 
@@ -178,7 +171,6 @@
     <string name="exportPassword">Tetapkan kata sandi untuk melindungi ekspor anda (opsional)</string>
     <string name="failedGeneratingShareURL">Tidak dapat membuat alamat berbagi. Mohon laporkan ini.</string>
     <string name="app_contributors">Pengembangan dibantu oleh: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="swipeToSwitchImages">Geser untuk beralih gambar, tahan untuk membuka gambar di aplikasi galeri</string>
     <string name="reverse">…dalam urutan terbalik</string>
     <string name="version_history">Riwayat Versi</string>
     <string name="help_translate_this_app">Bantu terjemahkan aplikasi ini</string>
@@ -234,9 +226,7 @@
         <item quantity="other"><xliff:g>%s</xliff:g> poin</item>
     </plurals>
     <string name="showMoreInfo">Tampilkan informasi</string>
-    <string name="hideMoreInfo">Sembunyikan informasi</string>
     <string name="shortcutSelectCard">Pilih kartu</string>
-    <string name="set_scale">Atur skala</string>
     <string name="include_if_asking_support">Jika anda ingin meminta bantuan, sertakan informasi berikut:</string>
     <string name="duplicateCard">Duplikat</string>
     <string name="archive">Arsip</string>
@@ -257,4 +247,19 @@
     <string name="currentBalanceSentence">Saldo saat ini: <xliff:g>%s</xliff:g></string>
     <string name="updateBalanceTitle">Berapa banyak yang telah kamu habiskan \?</string>
     <string name="noCameraPermissionDirectToSystemSetting">Untuk memindai barcode, Catima membutuhkan akses ke kamera mu. Tap disini untuk mengganti pengaturan perizinan mu.</string>
+    <string name="cameraPermissionRequired">Berikan izin untuk mengakses kamera anda…</string>
+    <string name="storageReadPermissionRequired">Berikan izin untuk membaca penyimpanan anda…</string>
+    <string name="validFromDate">Valid dari</string>
+    <string name="validFromSentence">Valid dari: 
+\n<xliff:g>%s</xliff:g></string>
+    <string name="anyDate">Kapan pun</string>
+    <string name="chooseValidFromDate">Pilih valid dari tanggal</string>
+    <string name="height">Tinggi:</string>
+    <string name="switchToFrontImage">Ubah ke depan gambar</string>
+    <string name="switchToBackImage">Ubah ke belakang gambar</string>
+    <string name="switchToBarcode">Ubah ke kode batang</string>
+    <string name="openFrontImageInGalleryApp">Buka gambar didepan di galeri app</string>
+    <string name="openBackImageInGalleryApp">Buka gambar dibelakang di galeri app</string>
+    <string name="setBarcodeHeight">Atur tinggi kode batang</string>
+    <string name="donate">Donasi</string>
 </resources>

app/src/main/res/values-is/strings.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_add">Bæta</string>
     <string name="noBarcode">Nei strikamerkið</string>
     <string name="action_search">Leita að</string>
     <string name="delete">Eyða</string>
-    <string name="noGiftCards">Smelltu á + plús takka til að bæta kort, eða að flytja inn sumir frá ⋮ matseðill fyrst.</string>
+    <string name="noGiftCards">Smelltu á + plús takka til að bæta korti, eða að flytja inn frá ⋮ Valmynd.</string>
     <string name="note">Athugið</string>
     <string name="barcodeType">Strikamerkið tegund</string>
     <string name="cancel">Hætta</string>
-    <string name="noMatchingGiftCards">Vissi ekki að finna neitt. Reyna að breyta leita.</string>
+    <string name="noMatchingGiftCards">Engar niðurstöður. Prófaðu að breyta leitarorði.</string>
     <string name="storeName">Nafnið</string>
     <string name="barcodeNoBarcode">Þetta kort hefur ekki strikamerkið</string>
     <string name="star">Bæta við eftirlæti</string>
@@ -33,7 +33,6 @@
     <string name="importExportHelp">Stuðningur upp spil gerir þér kleift að færa þá til annar tæki.</string>
     <string name="importSuccessfulTitle">Flutt</string>
     <string name="importFailedTitle">Innflutningur mistókst</string>
-    <string name="noExternalStoragePermissionError">Grant ytri geymslu leyfi til að flytja eða flytja spil fyrstu</string>
     <string name="exportOptionExplanation">Gögnum verður skrifað á stað af eigin vali.</string>
     <string name="importOptionFilesystemTitle">Innflutningur frá möppuna</string>
     <string name="importOptionFilesystemExplanation">Velja ákveðna skrá frá möppuna.</string>
@@ -41,12 +40,10 @@
     <string name="never">Aldrei</string>
     <string name="currency">Mynt</string>
     <string name="moveBarcodeToTopOfScreen">Færa strikamerkið að efst á skjánum</string>
-    <string name="moveBarcodeToCenterOfScreen">Miðju strikamerkið á skjánum</string>
     <string name="errorReadingImage">Gat ekki lesið ímynd</string>
     <string name="importOptionApplicationButton">Notaðu annan app</string>
     <string name="about">Um</string>
     <string name="settings">Stillingar</string>
-    <string name="settings_max_font_size_scale">Max. letrið</string>
     <string name="settings_keep_screen_on">Halda á skjánum</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Að koma í veg fyrir að læsa skjánum</string>
     <string name="editBarcode">Breyta strikamerkið</string>
@@ -77,8 +74,20 @@
     <string name="leaveWithoutSaveConfirmation">Fara án þess að bjarga\?</string>
     <string name="addFromImage">Veldu mynd frá gallerí</string>
     <string name="card">Kort</string>
-    <string name="barcode">Strikamerkið</string>
     <string name="expiryDate">Fyrningu</string>
     <string name="moveDown">Fara neðar</string>
     <string name="chooseExpiryDate">Velja rennur</string>
-</resources>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> valið</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> valin</item>
+    </plurals>
+    <string name="noGiftCardsGroup">Búðu til nokkur kort og settu þau síðan í hópinn hér.</string>
+    <string name="settings_brown_theme">Brún</string>
+    <string name="settings_green_theme">Grænn</string>
+    <string name="settings_grey_theme">Grár</string>
+    <string name="sort">flokka</string>
+    <string name="sort_by">flokka Eftir</string>
+    <string name="nextCard">Næsta</string>
+    <string name="settings_blue_theme">Blár</string>
+    <string name="settings_sky_blue_theme">Himinblár</string>
+</resources>

app/src/main/res/values-it/strings.xml

@@ -37,7 +37,6 @@
     <string name="exportFailed">Impossibile eseguire l\'esportazione</string>
     <string name="importing">Importazione in corso…</string>
     <string name="exporting">Esportazione in corso…</string>
-    <string name="noExternalStoragePermissionError">Concedi il permesso di archiviazione esterna per importare o esportare dati</string>
     <string name="importOptionFilesystemTitle">Importa dall\'archivio</string>
     <string name="importOptionFilesystemExplanation">Scegli un file dall\'archivio.</string>
     <string name="importOptionFilesystemButton">Dall\'archivio</string>
@@ -48,7 +47,6 @@
     <string name="app_license">Software libero con copyleft, licenza GPLv3+</string>
     <string name="about_title_fmt">Informazioni su <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versione: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Informazioni sulla revisione: <xliff:g id="app_revision_url"> %s </xliff:g></string>
     <string name="selectBarcodeTitle">Seleziona codice a barre</string>
     <string name="enterBarcodeInstructions">Inserisci il codice e scegli un tipo di codice a barre sotto oppure seleziona «Non c\'è un codice a barre».</string>
     <string name="copy_to_clipboard_toast">Codice copiato negli appunti</string>
@@ -92,13 +90,11 @@
     <string name="points">Punti</string>
     <string name="currency">Valuta</string>
     <string name="balance">Saldo</string>
-    <string name="moveBarcodeToCenterOfScreen">Centra il codice a barre sullo schermo</string>
     <string name="moveBarcodeToTopOfScreen">Sposta il codice a barre in cima allo schermo</string>
     <string name="chooseExpiryDate">Scegli data di scadenza</string>
     <string name="never">Mai</string>
     <string name="expiryDate">Data di scadenza</string>
     <string name="editBarcode">Modifica il codice a barre</string>
-    <string name="barcode">Codice a barre</string>
     <string name="card">Carta</string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Scaduta: <xliff:g>%s</xliff:g></string>
@@ -130,7 +126,6 @@
     <string name="errorReadingImage">Impossibile leggere l\'immagine</string>
     <string name="noBarcodeFound">Nessun codice a barre trovato</string>
     <string name="addFromImage">Seleziona immagine dalla galleria</string>
-    <string name="settings_max_font_size_scale">Dimensione massima del carattere</string>
     <string name="unsupportedBarcodeType">Questo tipo di codice a barre non può ancora essere visualizzato. Potrebbe essere supportato in una versione successiva dell\'applicazione.</string>
     <string name="wrongValueForBarcodeType">Il valore non è valido per il tipo di codice a barre selezionato</string>
     <string name="app_resources">Risorse libere di terze parti: <xliff:g id="app_resources_list"> %s </xliff:g></string>
@@ -151,7 +146,7 @@
     <string name="backImageDescription">Immagine posteriore</string>
     <string name="frontImageDescription">Immagine frontale</string>
     <string name="passwordRequired">Si prega di inserire la password</string>
-    <string name="importStocardMessage">Seleziona il tuo file di esportazione <i>***-sync.zip</i> da Stocard per importarlo.
+    <string name="importStocardMessage">Seleziona il tuo file di esportazione <i>***.zip</i> da Stocard per importarlo.
 \nOttienilo inviando un\'e-mail a support@stocardapp.com chiedendo un\'esportazione dei tuoi dati.</string>
     <string name="importStocard">Importa da Stocard</string>
     <string name="turn_flashlight_off">Spegni la torcia</string>
@@ -189,10 +184,8 @@
     <string name="app_contributors">Reso possibile da: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="noGroupCards">Questo gruppo è vuoto</string>
     <string name="barcodeImageDescriptionWithType">Immagine del codice a barre in formato <xliff:g>%s</xliff:g></string>
-    <string name="swipeToSwitchImages">Scorri per cambiare immagine, tieni premuto per aprire l\'immagine nella galleria</string>
     <string name="sort_by">Ordina per</string>
     <string name="reverse">…in ordine inverso</string>
-    <string name="sort_by_balance">Saldo</string>
     <string name="sort_by_expiry">Scadenza</string>
     <string name="sort_by_most_recently_used">Usate più recentemente</string>
     <string name="sort_by_name">Nome</string>
@@ -223,9 +216,7 @@
     <string name="shortcutSelectCard">Seleziona una tessera</string>
     <string name="options">Opzioni</string>
     <string name="starred">Nei preferiti</string>
-    <string name="set_scale">Imposta la scala</string>
     <string name="showMoreInfo">Mostra info</string>
-    <string name="hideMoreInfo">Nascondi info</string>
     <plurals name="balancePoints">
         <item quantity="one"><xliff:g>%s</xliff:g> punto</item>
         <item quantity="many"><xliff:g>%s</xliff:g> punti</item>
@@ -270,4 +261,18 @@
     <string name="currentBalanceSentence">Bilancio attuale: <xliff:g>%s</xliff:g></string>
     <string name="newBalanceSentence">Nuovo bilancio: <xliff:g>%s</xliff:g></string>
     <string name="importCards">Importa carte</string>
+    <string name="storageReadPermissionRequired">Per questa azione è necessario il permesso per accedere alla memoria del dispositivo…</string>
+    <string name="cameraPermissionRequired">Per questa azione è necessario il permesso ad accedere alla fotocamera…</string>
+    <string name="validFromDate">Valido dal</string>
+    <string name="chooseValidFromDate">Scegli la data di validità</string>
+    <string name="validFromSentence">Valido da: <xliff:g>%s</xliff:g></string>
+    <string name="anyDate">Qualsiasi data</string>
+    <string name="height">Altezza:</string>
+    <string name="switchToFrontImage">Passa all\'immagine frontale</string>
+    <string name="switchToBackImage">Passa all\'immagine dietro</string>
+    <string name="switchToBarcode">Passa al codice a barre</string>
+    <string name="openFrontImageInGalleryApp">Apri l\'immagine frontale nell\'app Galleria</string>
+    <string name="donate">Dona</string>
+    <string name="openBackImageInGalleryApp">Apri l\'immagine posteriore nell\'app Galleria</string>
+    <string name="setBarcodeHeight">Imposta l\'altezza del codice a barre</string>
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -25,13 +25,11 @@
     <string name="balance">残高</string>
     <string name="errorReadingImage">画像が読み込めませんでした</string>
     <string name="noBarcodeFound">バーコードが見つかりませんでした</string>
-    <string name="moveBarcodeToCenterOfScreen">バーコードを画面の中央に配置</string>
     <string name="moveBarcodeToTopOfScreen">バーコードを画面の上部に移動</string>
     <string name="chooseExpiryDate">有効期限を選択</string>
     <string name="never">なし</string>
     <string name="expiryDate">有効期限</string>
     <string name="editBarcode">バーコードの編集</string>
-    <string name="barcode">バーコード</string>
     <string name="card">カード</string>
     <string name="balanceSentence">残高: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">期限切れ: <xliff:g>%s</xliff:g></string>
@@ -58,7 +56,6 @@
     <string name="settings_disable_lockscreen_while_viewing_card">バーコード表示中は画面をロックしない</string>
     <string name="settings_keep_screen_on">バーコード表示中は画面を消灯しない</string>
     <string name="settings_display_barcode_max_brightness">バーコード表示画面を明るくする</string>
-    <string name="settings_max_font_size_scale">最大のフォントサイズ</string>
     <string name="settings_dark_theme">ダーク</string>
     <string name="settings_light_theme">ライト</string>
     <string name="settings_system_theme">システムに従う</string>
@@ -71,7 +68,6 @@
     <string name="enterBarcodeInstructions">カード番号を入力し、バーコード形式を選択してください。</string>
     <string name="selectBarcodeTitle">バーコード選択</string>
     <string name="app_libraries">Libre third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_revision_fmt">Revision Info: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
     <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
     <string name="app_license">Copylefted libre software, licensed GPLv3+</string>
@@ -87,7 +83,6 @@
     <string name="importOptionFilesystemExplanation">ストレージからファイルを選択してください。</string>
     <string name="importOptionFilesystemTitle">ストレージからインポート</string>
     <string name="exportOptionExplanation">選択した場所にデータを出力します。</string>
-    <string name="noExternalStoragePermissionError">データをインポート/エクスポートするために外部ストレージへのアクセスを許可してください</string>
     <string name="exporting">エクスポート中…</string>
     <string name="importing">インポート中…</string>
     <string name="exportFailed">カードをエクスポートできませんでした</string>
@@ -152,7 +147,7 @@
     <string name="photos">フォト</string>
     <string name="backImageDescription">裏</string>
     <string name="frontImageDescription">表</string>
-    <string name="importStocardMessage">Stocardでエクスポートした<i>***-sync.zip</i>ファイルを選択してください。
+    <string name="importStocardMessage">Stocardでエクスポートした<i>***.zip</i>ファイルを選択してください。
 \nファイルがない場合、e-mailing support@stocardapp.comにデータのエクスポートを要求してください。</string>
     <string name="importStocard">Stocardからインポート</string>
     <plurals name="selectedCardCount">
@@ -181,9 +176,7 @@
     <string name="settings_system_locale">システムに従う</string>
     <string name="settings_locale">言語</string>
     <string name="noGroupCards">このグループにはカードがありません</string>
-    <string name="swipeToSwitchImages">画像を切り替えるには長押し、またはスワイプ</string>
     <string name="sort_by">並び替え</string>
-    <string name="sort_by_balance">残高</string>
     <string name="sort_by_expiry">期限</string>
     <string name="sort_by_most_recently_used">最近使用したカード</string>
     <string name="sort_by_name">名前</string>

app/src/main/res/values-ko/strings.xml

@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="addManually">직접 카드 ID 입력</string>
-    <string name="groupsList">그룹: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="groupsList">그룹: <xliff:g>%s</xliff:g></string>
     <string name="all">모두</string>
     <string name="groups">그룹</string>
     <string name="enter_group_name">그룹 이름 입력</string>
     <string name="settings_dark_theme">어두움</string>
     <string name="settings_light_theme">밝음</string>
-    <string name="debug_version_fmt">버전: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="version">%s</xliff:g></string>
-    <string name="about_title_fmt"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_name">%s</xliff:g> 정보</string>
+    <string name="debug_version_fmt">버전: <xliff:g id="version">%s</xliff:g></string>
+    <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g> 정보</string>
     <string name="settings_system_theme">시스템</string>
     <string name="settings_theme">테마</string>
     <string name="settings_category_title_ui">사용자 인터페이스</string>
     <string name="settings">설정</string>
     <string name="enterBarcodeInstructions">카드 ID를 입력하고 카드에서 사용하는 바코드 이미지를 선택하세요. 바코드를 사용하지 않는 경우 “이 카드는 바코드가 없음”을 선택하세요.</string>
-    <string name="app_revision_fmt">리비전 정보: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">바코드 선택</string>
     <string name="about">정보</string>
     <string name="exporting">내보내는 중…</string>
@@ -71,7 +70,11 @@
     <string name="noStoreError">매장을 입력하지 않음</string>
     <string name="starImage">즐겨찾기 별</string>
     <string name="settings_display_barcode_max_brightness">바코드를 표시할 때 화면 밝기 높이기</string>
-    <string name="barcode">바코드</string>
     <string name="deleteConfirmation">정말 이 카드를 삭제하시겠습니까\?</string>
     <string name="deleteTitle">카드 삭제</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="other">카드 <xliff:g>%d</xliff:g> 제거</item>
+    </plurals>
+    <string name="noGiftCardsGroup">카드를 몇 장 만든 다음 여기에서 그룹에 할당합니다.</string>
+    <string name="noCardsMessage">먼저 카드 추가</string>
 </resources>

app/src/main/res/values-lb/strings.xml

@@ -73,7 +73,6 @@
     <string name="settings_dark_theme">Donkel</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Bildschierm spären verhënneren</string>
     <string name="settings_light_theme">Liicht</string>
-    <string name="settings_max_font_size_scale">Max. Schrëftgréisst</string>
     <string name="settings_keep_screen_on">Hale Si op Bildschierm</string>
     <string name="importSuccessful">Kartendaten anere sproochen</string>
     <string name="exportSuccessful">Exportierte Kartendaten</string>

app/src/main/res/values-lt/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_add">Pridėti</string>
-    <string name="noGiftCards">Norėdami pridėti kortelę, spustelėkite mygtuką + plius arba importuokite kortelę iš ⋮ meniu.</string>
+    <string name="noGiftCards">Norėdami pridėti kortelę, spustelėkite mygtuką + arba importuokite kortelę iš ⋮ meniu.</string>
     <string name="storeName">Pavadinimas</string>
     <string name="note">Užrašas</string>
     <string name="cardId">Kortelės ID</string>
@@ -23,12 +23,10 @@
     <string name="exportFailed">Nepavyko eksportuoti</string>
     <string name="importing">Importuoja…</string>
     <string name="exporting">Eksportuoja…</string>
-    <string name="noExternalStoragePermissionError">Pirmiausia suteikite išorinės saugyklos leidimą, kad galėtumėte importuoti arba eksportuoti korteles</string>
     <string name="about">Apie</string>
     <string name="app_license">Copylefted laisvoji programinė įranga, licencijuota GPLv3+</string>
     <string name="about_title_fmt">Apie <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versija: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Revizijos info: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Pasirinkite brūkšninį kodą</string>
     <string name="copy_to_clipboard_toast">ID nukopijuota į iškarpinę</string>
     <string name="card_ids_copied">Nukopijuoti ID</string>
@@ -48,9 +46,8 @@
     <string name="importLoyaltyCardKeychainMessage">Pasirinkite savo <i> LoyaltyCardKeychain.csv</i> eksportą iš Loyalty Card Keychain, kurį norite importuoti.
 \nSukurkite jį iš Loyalty Card Keychain meniu Importavimas/Eksportavimas, pirmiausia paspausdami Eksportuoti.</string>
     <string name="importLoyaltyCardKeychain">Importuoti iš Loyalty Card Keychain</string>
-    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="app_loyalty_card_keychain">Lojalumo kortelės</string>
     <string name="parsingBalanceFailed">Panašu, kad <xliff:g> %s </xliff:g> reikšmė nėra tinkama.</string>
-    <string name="moveBarcodeToCenterOfScreen">Centruoti brūkšninį kodą ekrane</string>
     <string name="moveBarcodeToTopOfScreen">Perkelti brūkšninį kodą į ekrano viršų</string>
     <string name="settings_display_barcode_max_brightness">Šviesinti brūkšninio kodo rodinį</string>
     <string name="failedParsingImportUriError">Nepavyko iššifruoti importo URI</string>
@@ -76,7 +73,7 @@
     <string name="setBarcodeId">Nustatyti brūkšninio kodo reikšmę</string>
     <string name="sameAsCardId">Tokia pat kaip ID</string>
     <string name="barcodeId">Brūkšninio kodo reikšmė</string>
-    <string name="importStocardMessage">Pasirinkite <i>***-sync.zip</i> eksportą iš Stocard, kad galėtumėte importuoti.
+    <string name="importStocardMessage">Pasirinkite <i>***.zip</i> eksportą iš Stocard, kad galėtumėte importuoti.
 \nGaukite susisiekę el. paštu support@stocardapp.com, prašydami eksportuoti jūsų duomenis.</string>
     <string name="importStocard">Importuoti iš Stocard</string>
     <string name="importFidmeMessage">Pasirinkite <i>fidme-export-request-xxxxxx.zip</i> eksportą iš FidMe, kurį norite importuoti, ir po to brūkšninių kodų tipus pasirinkite rankiniu būdu.
@@ -100,7 +97,6 @@
     <string name="never">Niekada</string>
     <string name="expiryDate">Galiojimo data</string>
     <string name="editBarcode">Redaguoti brūkšninį kodą</string>
-    <string name="barcode">Brūkšninis kodas</string>
     <string name="card">Kortelė</string>
     <string name="balanceSentence">Balansas: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Galiojimas baigėsi: <xliff:g>%s</xliff:g></string>
@@ -120,18 +116,17 @@
         <item quantity="few"><xliff:g>%d</xliff:g> kortelės</item>
         <item quantity="other"><xliff:g>%d</xliff:g> kortelių</item>
     </plurals>
-    <string name="noGroups">Spustelėkite + pliuso mygtuką, kad pridėtumėte grupes kategorizavimui.</string>
+    <string name="noGroups">Spustelėkite mygtuką +, kad pridėtumėte grupes kategorizavimui.</string>
     <string name="groups">Grupės</string>
     <string name="enter_group_name">Įvesti grupės pavadinimą</string>
     <string name="exportSuccessful">Duomenys eksportuoti</string>
     <string name="importSuccessful">Duomenys importuoti</string>
     <string name="intent_import_card_from_url_share_text">Noriu pasidalyti su jumis kortele</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Neleisti ekrano užrakinimo</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Neleisti užrakinti ekrano</string>
     <string name="settings_keep_screen_on">Laikyti ekraną įjungtą</string>
-    <string name="settings_max_font_size_scale">Didžiausias šrifto dydis</string>
     <string name="settings_dark_theme">Tamsi</string>
     <string name="settings_light_theme">Šviesi</string>
-    <string name="settings_system_theme">Sistema</string>
+    <string name="settings_system_theme">Sistemos</string>
     <string name="settings_theme">Tema</string>
     <string name="settings_category_title_ui">Vartotojo sąsaja</string>
     <string name="settings">Nustatymai</string>
@@ -189,10 +184,8 @@
     <string name="app_contributors">Tapo įmanoma su pagalba: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="noGroupCards">Grupėje yra tuščia</string>
     <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> brūkšninio kodo vaizdas</string>
-    <string name="swipeToSwitchImages">Braukite, kad perjungtumėte vaizdus, palaikykite, kad atvertumėte vaizdą galerijos programėlėje</string>
     <string name="sort_by">Rikiuoti pagal</string>
     <string name="reverse">…atvirkštine tvarka</string>
-    <string name="sort_by_balance">Balansas</string>
     <string name="sort_by_expiry">Galiojimo pabaiga</string>
     <string name="sort_by_most_recently_used">Vėliausiai naudota</string>
     <string name="sort_by_name">Pavadinimas</string>
@@ -235,8 +228,6 @@
         <item quantity="few"><xliff:g>%1$d</xliff:g> kortelės ( archyvuotos)<xliff:g id="archivedCount">%2$d</xliff:g></item>
         <item quantity="other"><xliff:g>%1$d</xliff:g> kortelių ( archyvuotų)<xliff:g id="archivedCount">%2$d</xliff:g></item>
     </plurals>
-    <string name="set_scale">Nustatyti mastelį</string>
-    <string name="hideMoreInfo">Slėpti informaciją</string>
     <string name="updateBalance">Atnaujinti balansą</string>
     <string name="failedToRetrieveImageFile">Nepavyko gauti vaizdo failo</string>
     <string name="barcodeLongPressMessage">Galerijos programėlėje galima atidaryti tik vaizdus</string>
@@ -270,4 +261,18 @@
         <item quantity="other"><xliff:g>%s</xliff:g> taškų</item>
     </plurals>
     <string name="importCards">Importuoti korteles</string>
+    <string name="storageReadPermissionRequired">Šio veiksmo atlikimui reikalinga prieiga prie saugyklos…</string>
+    <string name="cameraPermissionRequired">Šio veiksmo atlikimui reikalinga prieiga prie kameros…</string>
+    <string name="openBackImageInGalleryApp">Atidarykite galinį vaizdą galerijos programėlėje</string>
+    <string name="setBarcodeHeight">Nustatyti brūkšninio kodo aukštį</string>
+    <string name="validFromDate">Galioja nuo</string>
+    <string name="anyDate">Bet kuri data</string>
+    <string name="chooseValidFromDate">Pasirinkite datą, galiojančią nuo</string>
+    <string name="validFromSentence">Galioja nuo: <xliff:g>%s</xliff:g></string>
+    <string name="switchToBackImage">Perjungti į galinį vaizdą</string>
+    <string name="switchToBarcode">Perjungti į brūkšninį kodą</string>
+    <string name="height">Aukštis:</string>
+    <string name="switchToFrontImage">Perjungti į priekinį vaizdą</string>
+    <string name="openFrontImageInGalleryApp">Atidarykite priekinį vaizdą galerijos programėlėje</string>
+    <string name="donate">Aukoti</string>
 </resources>

app/src/main/res/values-lv/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_search">Meklēt</string>
     <string name="action_add">Pievienot</string>
-    <string name="noGiftCards">Noklikšķiniet uz pogas + plus, lai pievienotu karti, vai vispirms importējiet dažus no ⋮ izvēlnes.</string>
+    <string name="noGiftCards">Noklikšķiniet uz pogas + plus, lai pievienotu karti, vai vispirms importējiet no ⋮ izvēlnes.</string>
     <string name="noMatchingGiftCards">Nav rezultātu. Mēģiniet mainīt meklējamo tekstu.</string>
     <string name="storeName">Nosaukums</string>
     <string name="note">Piezīme</string>
@@ -16,7 +16,6 @@
     <string name="edit">Rediģēt</string>
     <string name="delete">Dzēst</string>
     <string name="moveBarcodeToTopOfScreen">Pārvietojiet svītrkodu uz ekrāna augšdaļu</string>
-    <string name="moveBarcodeToCenterOfScreen">Centrējiet svītrkodu uz ekrāna</string>
     <string name="errorReadingImage">Nevarēja nolasīt attēlu</string>
     <string name="balance">Bilance</string>
     <string name="noBarcodeFound">Svītrkods netika atrasts</string>
@@ -48,7 +47,6 @@
     <string name="exportFailed">Kartes neizdevās eksportēt</string>
     <string name="importing">Importē…</string>
     <string name="exporting">Eksportē…</string>
-    <string name="noExternalStoragePermissionError">Piešķiriet ārējai atmiņai atļauju vispirms importēt vai eksportēt kartes</string>
     <string name="exportOptionExplanation">Dati tiks saglabāti Jūsu izvēlētajā vietā.</string>
     <string name="importOptionFilesystemTitle">Imports no failu sistēmas</string>
     <string name="importOptionFilesystemExplanation">Izvēlieties konkrētu failu no failu sistēmas.</string>
@@ -68,7 +66,6 @@
     <string name="settings_system_theme">Sistēmas</string>
     <string name="settings_light_theme">Gaiša</string>
     <string name="settings_dark_theme">Tumša</string>
-    <string name="settings_max_font_size_scale">Maksimālais burtu lielums</string>
     <string name="settings_display_barcode_max_brightness">Izgaismot svītrkoda skatu</string>
     <string name="settings_keep_screen_on">Turēt ekrānu ieslēgtu</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Neļaut ekrānam aizslēgties</string>
@@ -86,7 +83,6 @@
     <string name="leaveWithoutSaveConfirmation">Iziet nesaglabājot\?</string>
     <string name="addFromImage">Izvēlēties attēlu no galerijas</string>
     <string name="card">Karte</string>
-    <string name="barcode">Svītrkods</string>
     <string name="expiryDate">Derīguma termiņš</string>
     <string name="never">Nekad</string>
     <string name="chooseExpiryDate">Izvēlieties derīguma termiņu</string>
@@ -96,7 +92,6 @@
     <string name="reverse">...apgrieztā secībā</string>
     <string name="credits">Pateicības</string>
     <string name="shortcutSelectCard">Izvēlieties karti</string>
-    <string name="set_scale">Iestatiet mērogu</string>
     <string name="duplicateCard">Dublēt</string>
     <string name="archive">Arhivēt</string>
     <string name="translate_platform">vietnē Weblate</string>
@@ -110,7 +105,6 @@
     </plurals>
     <string name="noCardIdError">Numurs nav ievadīts</string>
     <string name="about_title_fmt">Par <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="app_revision_fmt">Versijas pārskats: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Derīguma termiņš beidzās: <xliff:g>%s</xliff:g></string>
     <string name="action_hide_details">Slēpt detaļas</string>
     <string name="action_show_details">Rādīt detalizēti</string>
@@ -144,7 +138,6 @@
     <string name="failedGeneratingShareURL">Nevarēja izveidot koplietojamu URL. Lūdzu, ziņojiet par šo kļūdu.</string>
     <string name="turn_flashlight_off">Izslēgt zibspuldzi</string>
     <string name="app_contributors">To padarīja iespējamu: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="sort_by_balance">Bilance</string>
     <string name="version_history">Versiju vēsture</string>
     <string name="sort_by">Kārtot pēc</string>
     <string name="help_translate_this_app">Palīdziet tulkot šo lietotni</string>
@@ -205,7 +198,7 @@
 \nFailu var izveidot Jūsu FidMe profilā, ejot uz \"Data Protection\" un spiežot \"Extract my data\".</string>
     <string name="importLoyaltyCardKeychain">Importēt no Loyalty Card Keychain</string>
     <string name="importStocard">Importēt no Stocard</string>
-    <string name="importStocardMessage">Importam izvēlieties Jūsu <i>***-sync.zip</i> eksporta failu no Stocard.
+    <string name="importStocardMessage">Importam izvēlieties Jūsu <i>***.zip</i> eksporta failu no Stocard.
 \nFailu var iegūt sūtot e-pastu uz support@stocardapp.com ar pieprasījumu eksportēt Jūsu datus.</string>
     <string name="importVoucherVault">Importēt no Voucher Vault</string>
     <string name="importVoucherVaultMessage">Importam izvēlieties Jūsu <i>vouchervault.json</i> failu no Voucher Vault.
@@ -234,8 +227,6 @@
     <string name="settings_grey_theme">Pelēka</string>
     <string name="sort">Kārtot</string>
     <string name="showMoreInfo">Rādīt informāciju</string>
-    <string name="hideMoreInfo">Slēpt informāciju</string>
-    <string name="swipeToSwitchImages">Velciet, lai pārslēgtu attēlus; spiediet un turiet lai atvērtu attēlu galerijas lietotnē</string>
     <string name="sort_by_most_recently_used">Nesen lietotās</string>
     <string name="unarchive">Atarhivēt</string>
     <string name="archived">Karte arhivēta</string>
@@ -257,4 +248,14 @@
     </plurals>
     <string name="failedToOpenUrl">Vispirms nepieciešams uzstādīt interneta pārlūku</string>
     <string name="welcome">Laipni lūgti Catima</string>
-</resources>
+    <string name="cameraPermissionRequired">Ir nepieciešama pieeja kamerai lai veiktu šo darbību</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Lai skanētu svītrkods, Catima ir nepieciešama pieeja jūsu kamerai. Nospied šeit lai nomainītu atļaujas iestatījumus.</string>
+    <string name="cameraPermissionDeniedTitle">Nevar pievienieties kamerai</string>
+    <string name="updateBalance">Atjaunināta bilance</string>
+    <string name="updateBalanceTitle">Cik daudz Tu iztērēji\?</string>
+    <string name="updateBalanceHint">Ievadi summu</string>
+    <string name="currentBalanceSentence">Šābrīža bilance: <xliff:g>%s</xliff:g></string>
+    <string name="newBalanceSentence">Jauna bilance: <xliff:g>%s</xliff:g></string>
+    <string name="storageReadPermissionRequired">Atļauja lasīt noliktavu ir nepieciešama šai darbībai…</string>
+    <string name="importCards">Importēt kartes</string>
+</resources>

app/src/main/res/values-nb-rNO/strings.xml

@@ -33,7 +33,6 @@
     <string name="exportFailed">Kunne ikke utføre eksport</string>
     <string name="importing">Importerer…</string>
     <string name="exporting">Exporterer…</string>
-    <string name="noExternalStoragePermissionError">Innvilg lagringstilgang til eksternlager for å importere eller eksportere data</string>
     <string name="exportOptionExplanation">Data skrives dit du ønsker det.</string>
     <string name="importOptionFilesystemTitle">Importer fra filsystem</string>
     <string name="importOptionFilesystemExplanation">Velg spesifikk fil fra filsystemet.</string>
@@ -45,7 +44,6 @@
     <string name="app_license">Gemenhetslig fri programvare, lisensiert GPLv3+</string>
     <string name="about_title_fmt">Om <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versjon: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Utgivelsesinfo: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Velg strekkode</string>
     <string name="enterBarcodeInstructions">Skriv inn kortets ID, og enten velg strekkodetypen nedenfor, eller «Det er ingen strekkode».</string>
     <string name="copy_to_clipboard_toast">ID kopiert til utklippstavle</string>
@@ -88,14 +86,12 @@
     </plurals>
     <string name="groupsList">Grupper: <xliff:g>%s</xliff:g></string>
     <string name="editBarcode">Rediger strekkode</string>
-    <string name="barcode">Strekkode</string>
     <string name="card">Kort</string>
     <string name="expiryStateSentence">Utløper: <xliff:g>%s</xliff:g></string>
     <string name="chooseExpiryDate">Velg utløpsdato</string>
     <string name="never">Aldri</string>
     <string name="expiryDate">Utløpsdato</string>
     <string name="expiryStateSentenceExpired">Utløpt: <xliff:g>%s</xliff:g></string>
-    <string name="moveBarcodeToCenterOfScreen">Sentrer strekkoden på skjermen</string>
     <string name="moveBarcodeToTopOfScreen">Flytt strekkoden til toppen av skjermen</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> ser ikke ut til å være en gyldig saldo.</string>
     <string name="points">Poeng</string>
@@ -128,7 +124,6 @@
     <string name="importLoyaltyCardKeychain">Importer fra Kundekortknippe</string>
     <string name="importFidmeMessage">Velg din <i>fidme.export-request-xxxxx.zip</i>-eksport fra FidMe å importere, for så å velge strekkodetypene manuelt etterpå-
 \nOpprett den i din FidMe-profil ved å velge «Databeskyttelse», for så å trykke «Pakk ut dataen min» først.</string>
-    <string name="settings_max_font_size_scale">Maks. skriftstørrelse</string>
     <string name="wrongValueForBarcodeType">Verdien er ikke gyldig for valgt strekkodetype</string>
     <string name="intent_import_card_from_url_share_multiple_text">Jeg vil dele noen kort med deg</string>
     <string name="copy_to_clipboard_multiple_toast">ID-er ble kopiert til utklippstavle</string>
@@ -147,7 +142,7 @@
     <string name="photos">Bilder</string>
     <string name="backImageDescription">Baksidebilde</string>
     <string name="frontImageDescription">Forsidebilde</string>
-    <string name="importStocardMessage">Velg din <i>***-sync.zip</i>-eksport fra Stocard å importere.
+    <string name="importStocardMessage">Velg din <i>***.zip</i>-eksport fra Stocard å importere.
 \nSkaff den ved å sende e-post til support@stocardapp.com der du etterspør eksport av dataen din.</string>
     <string name="passwordRequired">Skriv inn passordet</string>
     <string name="importStocard">Importer fra Stocard</string>
@@ -183,10 +178,8 @@
     <string name="settings_theme_color">Draktfarge</string>
     <string name="noGroupCards">Denne gruppen er tom</string>
     <string name="barcodeImageDescriptionWithType">Bilde av <xliff:g>%s</xliff:g>-strekkode</string>
-    <string name="swipeToSwitchImages">Dra for å bytte bilder, hold for å åpne et bilde i galleriet.</string>
     <string name="sort_by">Sortering</string>
     <string name="reverse">…i omvendt rekkefølge</string>
-    <string name="sort_by_balance">Saldo</string>
     <string name="sort_by_expiry">Utløp</string>
     <string name="sort_by_most_recently_used">Nyligst brukt</string>
     <string name="sort_by_name">Navn</string>
@@ -219,9 +212,7 @@
     <string name="translate_platform">på Weblate</string>
     <string name="options">Alternativer</string>
     <string name="starred">Stjernemerket</string>
-    <string name="set_scale">Sett skalering</string>
     <string name="showMoreInfo">Vis info</string>
-    <string name="hideMoreInfo">Skjul info</string>
     <plurals name="balancePoints">
         <item quantity="one"><xliff:g>%s</xliff:g> poeng</item>
         <item quantity="other"><xliff:g>%s</xliff:g> poeng</item>
@@ -254,7 +245,7 @@
         <item quantity="other">Vis arkiv (<xliff:g>%1$d</xliff:g> kort)</item>
     </plurals>
     <string name="failedToRetrieveImageFile">Kunne ikke hente bildefil</string>
-    <string name="barcodeLongPressMessage">Kun bilder kan åpnes i galleriet</string>
+    <string name="barcodeLongPressMessage">Kun bilder kan åpnes i galleriprogrammet</string>
     <string name="cameraPermissionDeniedTitle">Fikk ikke tilgang til kameraet</string>
     <string name="noCameraPermissionDirectToSystemSetting">Catima trenger kameratilgang for å skanne strekkoder. Trykk her for å endre tilgangsinnstillingene.</string>
     <string name="importCards">Importer kort</string>
@@ -263,4 +254,10 @@
     <string name="updateBalanceHint">Skriv inn beløp</string>
     <string name="newBalanceSentence">Ny saldo: <xliff:g>%s</xliff:g></string>
     <string name="updateBalance">Oppdater saldo</string>
+    <string name="validFromDate">Gyldig fra</string>
+    <string name="anyDate">Når som helst</string>
+    <string name="chooseValidFromDate">Velg en gyldig dato</string>
+    <string name="storageReadPermissionRequired">Lagringslesetilgang kreves for denne handlingen …</string>
+    <string name="validFromSentence">Gyldig fra: <xliff:g>%s</xliff:g></string>
+    <string name="cameraPermissionRequired">Kameratilgang kreves for denne handlingen …</string>
 </resources>

app/src/main/res/values-night/themes.xml

@@ -27,10 +27,18 @@
         <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_dark_primaryInverse</item>
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog.Monet</item>
+        <item name="alertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog.Monet</item>
 
         <item name="windowActionModeOverlay">true</item>
     </style>
 
+    <style name="ThemeOverlay.App.MaterialAlertDialog.Monet" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="alertDialogStyle">@style/MaterialAlertDialog.Material3</item>
+        <item name="dialogCornerRadius">28dp</item>
+        <item name="android:background">@drawable/dialog_bg_monet</item>
+    </style>
+
     <!-- note that this is not used directly, these are used to patch the active theme runtime with
     theme.applyStyle
     -->

app/src/main/res/values-nl/strings.xml

@@ -29,7 +29,7 @@
     <string name="failedParsingImportUriError">Kan de import-uri niet verwerken</string>
     <string name="importExport">Importeren/Exporteren</string>
     <string name="exportName">Exporteren</string>
-    <string name="importExportHelp">Door je gegevens te back-uppen, kun je ze overzetten naar een ander apparaat.</string>
+    <string name="importExportHelp">Met een reservekopie van je gegevens kun je ze overzetten naar een ander apparaat.</string>
     <string name="importSuccessfulTitle">Importeren voltooid</string>
     <string name="importFailedTitle">Importeren mislukt</string>
     <string name="importFailed">Het importeren is mislukt</string>
@@ -38,7 +38,6 @@
     <string name="exportFailed">Het exporteren is mislukt</string>
     <string name="importing">Bezig met importeren…</string>
     <string name="exporting">Bezig met exporteren…</string>
-    <string name="noExternalStoragePermissionError">Verleen het recht ‘externe opslag’ om gegevens te kunnen im- of exporteren</string>
     <string name="exportOptionExplanation">De gegevens worden weggeschreven op een locatie naar keuze.</string>
     <string name="importOptionFilesystemTitle">Importeren uit bestandssysteem</string>
     <string name="importOptionFilesystemExplanation">Kies een specifiek bestand van het bestandssysteem.</string>
@@ -50,7 +49,6 @@
     <string name="app_license">Vrije software, uitgebracht onder de GPLv3+-licentie</string>
     <string name="about_title_fmt">Over <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versie: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Versie-informatie: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Barcode toevoegen</string>
     <string name="enterBarcodeInstructions">Voer de kaart-id in en kies daarna het soort barcode of druk op “Deze kaart heeft geen barcode”.</string>
     <string name="copy_to_clipboard_toast">De kaart-id is gekopieerd naar het klembord</string>
@@ -88,14 +86,12 @@
     </plurals>
     <string name="groupsList">Groepen: <xliff:g>%s</xliff:g></string>
     <string name="editBarcode">Barcode aanpassen</string>
-    <string name="barcode">Barcode</string>
     <string name="card">Kaart</string>
     <string name="chooseExpiryDate">Kies een vervaldatum</string>
     <string name="never">Nooit</string>
     <string name="expiryDate">Vervaldatum</string>
     <string name="expiryStateSentence">Vervalt op <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Verlopen: <xliff:g>%s</xliff:g></string>
-    <string name="moveBarcodeToCenterOfScreen">Barcode verplaatsen naar midden van scherm</string>
     <string name="moveBarcodeToTopOfScreen">Barcode verplaatsen naar bovenkant van scherm</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> lijkt geen geldig saldo te zijn.</string>
     <string name="points">Aantal punten</string>
@@ -129,7 +125,6 @@
     <string name="setBarcodeId">Barcodewaarde instellen</string>
     <string name="sameAsCardId">Gelijk aan kaart-id</string>
     <string name="barcodeId">Barcodewaarde</string>
-    <string name="settings_max_font_size_scale">Max. tekstgrootte</string>
     <string name="unsupportedBarcodeType">Dit type barcode kan nog niet worden getoond - we hopen hiervoor in een nieuwere versie ondersteuning toe te voegen.</string>
     <string name="wrongValueForBarcodeType">Deze waarde komt niet overeen met het gekozen barcodetype</string>
     <string name="app_resources">Vrije externe bronnen: <xliff:g id="app_resources_list">%s</xliff:g></string>
@@ -150,7 +145,7 @@
     <string name="backImageDescription">Achterzijde van kaart</string>
     <string name="frontImageDescription">Voorzijde van kaart</string>
     <string name="passwordRequired">Voer het wachtwoord in</string>
-    <string name="importStocardMessage">Kies het te importeren Stocard-exportbestand genaamd <i>***-sync.zip</i>.
+    <string name="importStocardMessage">Kies het te importeren Stocard-exportbestand genaamd <i>***.zip</i>.
 \nStuur een e-mail naar support@stocardapp.com waarin je vraagt om een exportbestand.</string>
     <string name="importStocard">Importeren uit Stocard</string>
     <string name="failedGeneratingShareURL">De te delen link kan niet worden gegenereerd. Meld deze fout.</string>
@@ -185,10 +180,8 @@
     <string name="app_contributors">Mede mogelijk gemaakt door: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="noGroupCards">Deze groep bevat geen kaarten</string>
     <string name="barcodeImageDescriptionWithType">Afbeelding van barcode <xliff:g>%s</xliff:g></string>
-    <string name="swipeToSwitchImages">Veeg om te bladeren; houd lang ingedrukt om te openen in de galerij-app</string>
     <string name="sort_by">Sorteren op</string>
     <string name="reverse">…in omgekeerde volgorde</string>
-    <string name="sort_by_balance">Op saldo</string>
     <string name="sort_by_expiry">Op vervaldatum</string>
     <string name="sort_by_most_recently_used">Op onlangs gebruikt</string>
     <string name="sort_by_name">Op naam</string>
@@ -220,8 +213,6 @@
     <string name="options">Opties</string>
     <string name="showMoreInfo">Informatie tonen</string>
     <string name="starred">Favoriet</string>
-    <string name="hideMoreInfo">Informatie verbergen</string>
-    <string name="set_scale">Schaal instellen</string>
     <plurals name="balancePoints">
         <item quantity="one"><xliff:g>%s</xliff:g> punt</item>
         <item quantity="other"><xliff:g>%s</xliff:g> punten</item>
@@ -263,4 +254,19 @@
     <string name="updateBalanceHint">Voer een bedrag in</string>
     <string name="newBalanceSentence">Nieuw saldo: <xliff:g>%s</xliff:g></string>
     <string name="importCards">Kaarten importeren</string>
+    <string name="storageReadPermissionRequired">Toestemming om de opslag uit te lezen benodigd voor deze actie…</string>
+    <string name="cameraPermissionRequired">Toestemming om de camera te openen benodigd voor deze actie…</string>
+    <string name="anyDate">Iedere datum</string>
+    <string name="validFromDate">Geldig vanaf</string>
+    <string name="validFromSentence">Geldig vanaf: <xliff:g>%s</xliff:g></string>
+    <string name="chooseValidFromDate">Kies een geldige vanaf-datum</string>
+    <string name="setBarcodeHeight">Barcodehoogte instellen</string>
+    <string name="height">Hoogte:</string>
+    <string name="switchToFrontImage">Voorzijde tonen</string>
+    <string name="switchToBackImage">Achterzijde tonen</string>
+    <string name="switchToBarcode">Barcode tonen</string>
+    <string name="openFrontImageInGalleryApp">Voorzijde openen in galerij-app</string>
+    <string name="openBackImageInGalleryApp">Achterzijde openen in galerij-app</string>
+    <string name="donate">Doneren</string>
+    <string name="icon_header_click_text">Houd lang ingedrukt om pictogram te bewerken</string>
 </resources>

app/src/main/res/values-oc/strings.xml

@@ -51,7 +51,7 @@
     <string name="settings">Paramètres</string>
     <string name="settings_category_title_ui">Interfàcia utilizaire</string>
     <string name="settings_theme">Tèma</string>
-    <string name="noGiftCards">Clicatz lo boton + per apondre una carta o utilizatz lo menú ⋮ per n’importar una.</string>
+    <string name="noGiftCards">Clicatz lo boton + per apondre una carta o n’importar una menú ⋮</string>
     <string name="noMatchingGiftCards">Cap de resultat. Ensajatz de modificar vòstra recèrca.</string>
     <string name="settings_light_theme">Clar</string>
     <string name="settings_dark_theme">Escur</string>
@@ -63,7 +63,7 @@
     <string name="addFromImage">Causir a la galariá</string>
     <string name="groups">Grops</string>
     <string name="groupsList">Grops : <xliff:g>%s</xliff:g></string>
-    <string name="settings_max_font_size_scale">Talha max. de la poliça</string>
     <string name="settings_theme_color">Color del tèma</string>
     <string name="settings_locale">Lenga</string>
+    <string name="noGiftCardsGroup">Creatz de cartas puèi ligatz-las al grop aicí.</string>
 </resources>

app/src/main/res/values-pl/strings.xml

@@ -37,7 +37,6 @@
     <string name="exportFailed">Nie udało się wyeksportować</string>
     <string name="importing">Importowanie…</string>
     <string name="exporting">Eksportowanie…</string>
-    <string name="noExternalStoragePermissionError">Przyznaj uprawnienia pamięci zewnętrznej, aby importować lub eksportować dane</string>
     <string name="importOptionFilesystemTitle">Importuj z systemu plików</string>
     <string name="importOptionFilesystemExplanation">Wybierz określony plik z systemu plików.</string>
     <string name="importOptionFilesystemButton">Z systemu plików</string>
@@ -48,7 +47,6 @@
     <string name="app_license">Wolne oprogramowanie typu copyleft, na licencji GPLv3+</string>
     <string name="about_title_fmt">O <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Wersja: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Informacje o wydaniu: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Wybierz kod kreskowy</string>
     <string name="enterBarcodeInstructions">Wprowadź ID, a następnie wybierz typ kodu kreskowego, którego chcesz użyć lub wybierz „Bez kodu kreskowego”.</string>
     <string name="copy_to_clipboard_toast">Skopiowano ID do schowka</string>
@@ -116,7 +114,7 @@
     <string name="importVoucherVaultMessage">Wybierz swój <i>vouchervault.json</i> z Voucher Vault, aby zaimportować.
 \nUtwórz go wpierw klikając Eksportuj w Voucher Vault.</string>
     <string name="importVoucherVault">Importuj z Voucher Vault</string>
-    <string name="importStocardMessage">Wybierz swój <i>***-sync.zip</i> z Stocard, aby zaimportować.
+    <string name="importStocardMessage">Wybierz swój <i>***.zip</i> z Stocard, aby zaimportować.
 \nUzyskaj go, wysyłając email na adres support@stocardapp.com, z prośbą o eksport Twoich danych.</string>
     <string name="importStocard">Importuj z Stocard</string>
     <string name="importLoyaltyCardKeychainMessage">Wybierz swój <i>LoyaltyCardKeychain.csv</i> z Loyalty Card Keychain, aby zaimportować.
@@ -133,7 +131,7 @@
 \n
 \nŻADNE DANE NIE SĄ ZBIERANE, co może potwierdzić każdy, gdyż nasza aplikacja jest wolnym oprogramowaniem.</string>
     <string name="privacy_policy">Polityka prywatności</string>
-    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="app_loyalty_card_keychain">Brelok dla twoich kart lojalnościowych</string>
     <string name="chooseImportType">Importuj dane z</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> nie wydaje się być prawidłową wartością.</string>
     <string name="points">Punkty</string>
@@ -141,13 +139,11 @@
     <string name="balance">Saldo</string>
     <string name="errorReadingImage">Nie udało się odczytać zdjęcia</string>
     <string name="noBarcodeFound">Nie znaleziono kodu kreskowego</string>
-    <string name="moveBarcodeToCenterOfScreen">Wyśrodkuj kod kreskowy na ekranie</string>
     <string name="moveBarcodeToTopOfScreen">Przenieś kod kreskowy na górę ekranu</string>
     <string name="chooseExpiryDate">Wybierz datę wygaśnięcia</string>
     <string name="never">Nigdy</string>
     <string name="expiryDate">Data wygaśnięcia</string>
     <string name="editBarcode">Edytuj kod kreskowy</string>
-    <string name="barcode">Kod kreskowy</string>
     <string name="card">Karta</string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Wygasło: <xliff:g>%s</xliff:g></string>
@@ -169,7 +165,6 @@
     <string name="noGroupCards">Ta grupa jest pusta</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Zapobiegaj wyłączeniu ekranu</string>
     <string name="settings_keep_screen_on">Nie wygaszaj ekranu</string>
-    <string name="settings_max_font_size_scale">Maks. rozmiar czcionki</string>
     <string name="app_resources">Otwarte zewnętrzne zasoby: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Otwarte zewnętrzne biblioteki: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Wszelkie prawa zastrzeżone © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
@@ -196,21 +191,19 @@
     <string name="action_show_details">Pokaż szczegóły</string>
     <string name="action_hide_details">Ukryj szczegóły</string>
     <string name="sort_by_name">Nazwa</string>
-    <string name="sort_by_most_recently_used">Ostatnio użyte</string>
+    <string name="sort_by_most_recently_used">Ostatnio używane</string>
     <string name="sort_by_expiry">Data wygaśnięcia</string>
-    <string name="sort_by_balance">Balans</string>
     <string name="sort_by">Sortuj według</string>
     <string name="credits">Podziękowania</string>
-    <string name="help_translate_this_app">Pomóż przetłumaczyć tą aplikację</string>
+    <string name="help_translate_this_app">Pomóż przetłumaczyć tę aplikację</string>
     <string name="source_repository">Repozytorium Źródłowe</string>
     <string name="report_error">Zgłoś Błąd</string>
     <string name="setIcon">Ustaw ikonę</string>
     <string name="on_github">na GitHub\'ie</string>
-    <string name="swipeToSwitchImages">Przeciągnij aby zmienić obraz, przytrzymaj aby otworzyć obraz w galerii</string>
     <string name="selectColor">Wybierz kolor</string>
-    <string name="version_history">Historia Wersji</string>
+    <string name="version_history">Historia wersji</string>
     <string name="and_data_usage">i wykorzystanie danych</string>
-    <string name="rate_this_app">Oceń tą aplikację</string>
+    <string name="rate_this_app">Oceń tę aplikację</string>
     <string name="license">Licencja</string>
     <string name="on_google_play">w Google Play</string>
     <string name="noGiftCardsGroup">Stwórz karty i przypisz je do grup w tym miejscu.</string>
@@ -235,22 +228,20 @@
     </plurals>
     <string name="include_if_asking_support">Jeśli chcesz poprosić o pomoc, podaj następujące informacje:</string>
     <string name="settings_oled_dark">Całkowicie czarne tło dla ciemnego motywu</string>
-    <string name="hideMoreInfo">Ukryj informacje</string>
     <string name="settings_card_orientation">Orientacja kodu kreskowego</string>
     <string name="settings_follow_system_orientation">Śledź orientację systemową</string>
-    <string name="set_scale">Ustaw skalę</string>
     <string name="duplicateCard">Duplikuj</string>
     <string name="starred">Oznaczone gwiazdką</string>
     <string name="settings_landscape_orientation">Poziomowy</string>
     <string name="settings_lock_on_opening_orientation">Blokuj do ustawionej orientacji przy otwieraniu karty</string>
     <string name="settings_portrait_orientation">Portretowy</string>
-    <string name="archive">Archiwizować</string>
-    <string name="unarchive">Odarchiwizować</string>
-    <string name="archived">Karta archiwizowana</string>
-    <string name="unarchived">Karta odarchiwizowana</string>
+    <string name="archive">Archiwum</string>
+    <string name="unarchive">Cofnij archiwizację</string>
+    <string name="archived">Karta zarchiwizowana</string>
+    <string name="unarchived">Karta niezarchiwizowana</string>
     <string name="archiveList">Archiwum</string>
     <string name="noUnarchivedCardsMessage">Nie istnieją żadne niezarchiwizowane karty</string>
-    <string name="failedLaunchingPhotoPicker">Nie można odnaleźć aplikacji galerii</string>
+    <string name="failedLaunchingPhotoPicker">Nie można odnaleźć aplikacji galeria</string>
     <string name="previousCard">Poprzedni</string>
     <string name="nextCard">Następny</string>
     <plurals name="groupCardCountWithArchived">
@@ -269,13 +260,27 @@
         <item quantity="many">Wyświetl zarchiwizowane (<xliff:g>%1$d</xliff:g> karty)</item>
         <item quantity="other">Wyświetl zarchiwizowane (<xliff:g>%1$d</xliff:g> karty)</item>
     </plurals>
-    <string name="currentBalanceSentence">Saldo:
-\n<xliff:g>%s</xliff:g></string>
+    <string name="currentBalanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
     <string name="noCameraPermissionDirectToSystemSetting">By zeskanować kody kreskowe, Catima musi mieć dostęp do twojej kamery. Dotknij tutaj by zmienić swoje ustawienia dostępu.</string>
     <string name="updateBalanceTitle">Ile wydałeś\?</string>
     <string name="updateBalanceHint">Wpisz sumę</string>
     <string name="updateBalance">Zaktualizuj balans</string>
     <string name="cameraPermissionDeniedTitle">Odmówiono dostępu do kamery</string>
-    <string name="newBalanceSentence">Nowe saldo:
-\n<xliff:g>%s</xliff:g></string>
+    <string name="newBalanceSentence">Nowe saldo: <xliff:g>%s</xliff:g></string>
+    <string name="importCards">Importuj karty</string>
+    <string name="storageReadPermissionRequired">Pozwolenie na odczytanie pamięci masowej potrzebne do wykonania tej czynności…</string>
+    <string name="cameraPermissionRequired">Zezwolenie na dostęp do kamery potrzebne do wykonania tej czynności…</string>
+    <string name="validFromDate">Obowiązuje od</string>
+    <string name="chooseValidFromDate">Wybierz datę rozpoczęcia ważności</string>
+    <string name="anyDate">Dowolna data</string>
+    <string name="validFromSentence">Ważny od: <xliff:g>%s</xliff:g></string>
+    <string name="height">Wysokość:</string>
+    <string name="switchToFrontImage">Przełącz na obraz z przodu</string>
+    <string name="switchToBackImage">Przełącz na obraz z tyłu</string>
+    <string name="switchToBarcode">Przełącz na kod kreskowy</string>
+    <string name="openFrontImageInGalleryApp">Otwórz obraz z przodu w aplikacji galeria</string>
+    <string name="setBarcodeHeight">Ustaw wysokość kodu kreskowego</string>
+    <string name="donate">Darowizna</string>
+    <string name="openBackImageInGalleryApp">Otwórz obraz z powrotem w aplikacji galerii</string>
+    <string name="icon_header_click_text">Przytrzymaj, aby edytować ikonę</string>
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -62,7 +62,6 @@
     <string name="settings_system_theme">Sistema</string>
     <string name="settings_light_theme">Claro</string>
     <string name="settings_dark_theme">Escuro</string>
-    <string name="settings_max_font_size_scale">Tamanho máximo da fonte</string>
     <string name="selectBarcodeTitle">Selecionar código de barras</string>
     <string name="enterBarcodeInstructions">Introduza o identificador e depois escolha o tipo de código de barras abaixo ou \"Sem código de barras\".</string>
     <string name="copy_to_clipboard_toast">Identificador copiado para a área de transferência</string>
@@ -72,7 +71,6 @@
     <string name="moveUp">Subir</string>
     <string name="moveDown">Descer</string>
     <string name="leaveWithoutSaveTitle">Sair</string>
-    <string name="noExternalStoragePermissionError">Conceda primeiro a autorização de acesso ao armazenamento externo para importar ou exportar dados</string>
     <string name="importExportHelp">A cópia de segurança dos seus dados permite-lhe movê-los para outro dispositivo.</string>
     <string name="importSuccessfulTitle">Importado</string>
     <string name="importFailedTitle">A importação falhou</string>
@@ -84,7 +82,6 @@
     <string name="exporting">A exportar…</string>
     <string name="settings_sky_blue_theme">Azul céu</string>
     <string name="report_error">Reportar erro</string>
-    <string name="barcode">Código de barras</string>
     <string name="chooseImportType">Importar dados de</string>
     <string name="card">Cartão</string>
     <string name="expiryStateSentence">Expiram: <xliff:g>%s</xliff:g></string>
@@ -98,7 +95,7 @@
     <string name="sameAsCardId">Igual ao identificador</string>
     <string name="importFidmeMessage">Selecione a exportação <i>fidme-export-request-xxxxxx.zip</i> do FidMe para importar e depois selecione os tipos de código de barras manualmente.
 \nPrimeiro crie a exportação no seu perfil do FidMe escolhendo a opção \"Proteção de dados\" e em seguida pressionando \"Extrair os meus dados\".</string>
-    <string name="importStocardMessage">Selecione a exportação <i>***-sync.zip</i> do Stocard para importar.
+    <string name="importStocardMessage">Selecione a exportação <i>***.zip</i> do Stocard para importar.
 \nObtenha-o através do e-mail support@stocardapp.com solicitando uma exportação dos seus dados.</string>
     <string name="barcodeId">Valor do código de barras</string>
     <string name="wrongValueForBarcodeType">O valor não é válido para o tipo de código de barras selecionado</string>
@@ -125,7 +122,6 @@
 \ndireitos de autor © 2016–2020 Branden Archer</string>
     <string name="about_title_fmt">Sobre o <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versão: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Informação da revisão: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Expirados: <xliff:g>%s</xliff:g></string>
     <string name="leaveWithoutSaveConfirmation">Sair sem guardar\?</string>
     <string name="addManually">Introduzir manualmente o identificador</string>
@@ -137,7 +133,6 @@
     <string name="never">Nunca</string>
     <string name="chooseExpiryDate">Escolher validade</string>
     <string name="moveBarcodeToTopOfScreen">Mover o código de barras para o topo do ecrã</string>
-    <string name="moveBarcodeToCenterOfScreen">Centrar o código de barras no ecrã</string>
     <string name="noBarcodeFound">Não foi encontrado nenhum código de barras</string>
     <string name="errorReadingImage">Não foi possível ler a imagem</string>
     <string name="balance">Saldo</string>
@@ -178,11 +173,9 @@
     <string name="settings_blue_theme">Azul</string>
     <string name="app_contributors">Tornado possível por: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">Ordenar</string>
-    <string name="swipeToSwitchImages">Deslize para mudar as imagens, toque prolongadamente para abrir na aplicação da galeria</string>
     <string name="sort_by_name">Nome</string>
     <string name="sort_by_most_recently_used">Mais usados recentemente</string>
     <string name="sort_by_expiry">Validade</string>
-    <string name="sort_by_balance">Saldo</string>
     <string name="reverse">…na ordem inversa</string>
     <string name="sort_by">Ordenar por</string>
     <string name="version_history">Histórico de versões</string>
@@ -222,9 +215,7 @@
     <string name="shortcutSelectCard">Selecione um cartão</string>
     <string name="translate_platform">no Weblate</string>
     <string name="starred">Estrela</string>
-    <string name="set_scale">Escala de set</string>
     <string name="showMoreInfo">Mostrar info</string>
-    <string name="hideMoreInfo">Ocultar informação</string>
     <string name="options">Opções</string>
     <plurals name="balancePoints">
         <item quantity="one"><xliff:g>%s</xliff:g> ponto</item>
@@ -270,4 +261,18 @@
     <string name="updateBalance">Atualizar saldo</string>
     <string name="updateBalanceTitle">Quanto gastou\?</string>
     <string name="updateBalanceHint">Introduza o valor</string>
-</resources>
+    <string name="storageReadPermissionRequired">É necessária a permissão para ler o armazenamento para esta ação…</string>
+    <string name="cameraPermissionRequired">É necessária a permissão para aceder à câmara para esta ação…</string>
+    <string name="validFromDate">Válido desde</string>
+    <string name="anyDate">Qualquer data</string>
+    <string name="chooseValidFromDate">Escolha uma data desde válida</string>
+    <string name="validFromSentence">Válido desde: <xliff:g>%s</xliff:g></string>
+    <string name="switchToFrontImage">Mudar para imagem frontal</string>
+    <string name="height">Altura:</string>
+    <string name="switchToBackImage">Mudar para a imagem de trás</string>
+    <string name="switchToBarcode">Mudar para o código de barras</string>
+    <string name="openFrontImageInGalleryApp">Abra a imagem frontal no aplicativo da galeria</string>
+    <string name="openBackImageInGalleryApp">Abra a imagem traseira no aplicativo da galeria</string>
+    <string name="setBarcodeHeight">Definir altura do código de barras</string>
+    <string name="donate">Doar</string>
+</resources>

app/src/main/res/values-ro-rRO/strings.xml

@@ -38,7 +38,6 @@
     <string name="exportFailed">Nu s-a putut exporta carduri</string>
     <string name="importing">Importul…</string>
     <string name="exporting">Exportul…</string>
-    <string name="noExternalStoragePermissionError">Acordați mai întâi permisiunea de stocare externă pentru a importa sau exporta carduri</string>
     <string name="exportOptionExplanation">Datele vor fi scrise într-o locație aleasă de dumneavoastră.</string>
     <string name="importOptionFilesystemTitle">Import din sistemul de fișiere</string>
     <string name="importOptionApplicationTitle">Utilizați o altă aplicație</string>
@@ -58,7 +57,6 @@
     <string name="settings_light_theme">Lumină</string>
     <string name="settings_dark_theme">Întuneric</string>
     <string name="noBarcodeFound">Nu a fost găsit niciun cod de bare</string>
-    <string name="settings_max_font_size_scale">Mărimea maximă a fontului</string>
     <string name="settings_display_barcode_max_brightness">Luminați vizualizarea codurilor de bare</string>
     <string name="settings_keep_screen_on">Păstrați ecranul pornit</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Evitați ecranul de blocare</string>
@@ -70,11 +68,9 @@
     <string name="failedOpeningFileManager">Instalați mai întâi un manager de fișiere.</string>
     <string name="leaveWithoutSaveTitle">Ieșire</string>
     <string name="addManually">Introduceți manual ID-ul cardului</string>
-    <string name="barcode">Cod de bare</string>
     <string name="currency">Monedă</string>
     <string name="editBarcode">Editarea codului de bare</string>
     <string name="chooseExpiryDate">Alegeți data de expirare</string>
-    <string name="moveBarcodeToCenterOfScreen">Centrați codul de bare pe ecran</string>
     <string name="copy_to_clipboard_toast">ID-ul cardului copiat în clipboard</string>
     <string name="noStoreError">Nici un nume introdus</string>
     <string name="selectBarcodeTitle">Selectare cod de bare</string>

app/src/main/res/values-ru/strings.xml

@@ -38,7 +38,6 @@
     <string name="exportFailed">Невозможно выполнить экспорт</string>
     <string name="importing">Импорт…</string>
     <string name="exporting">Экспорт…</string>
-    <string name="noExternalStoragePermissionError">Импорт или экспорт данных невозможен без разрешения на доступ к хранилищу</string>
     <string name="exportOptionExplanation">Данные будут записаны в выбранное место.</string>
     <string name="importOptionFilesystemTitle">Импорт из файловой системы</string>
     <string name="importOptionFilesystemExplanation">Выберете файл на файловой системе.</string>
@@ -50,7 +49,6 @@
     <string name="app_license">Авторское лево свободного программного обеспечения, лицензия GPLv3+</string>
     <string name="about_title_fmt">О приложении <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Версия: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Информация о версиях: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Выбор штрих-кода</string>
     <string name="enterBarcodeInstructions">Введите номер и выберите тип штрих-кода (или выберите \"Нет штрих-кода\").</string>
     <string name="copy_to_clipboard_toast">Номер скопирован в буфер обмена</string>
@@ -93,13 +91,11 @@
     <string name="chooseImportType">Откуда импортировать данные</string>
     <string name="balance">Баланс</string>
     <string name="moveBarcodeToTopOfScreen">Переместить штрих-код в верхнюю часть экрана</string>
-    <string name="moveBarcodeToCenterOfScreen">Центрировать штрих-код на экране</string>
     <string name="currency">Валюта</string>
-    <string name="chooseExpiryDate">Указать срок действия</string>
+    <string name="chooseExpiryDate">Выбор срока действия</string>
     <string name="never">Никогда</string>
-    <string name="expiryDate">Окончание срока действия</string>
+    <string name="expiryDate">Срок действия</string>
     <string name="editBarcode">Изменить штрих-код</string>
-    <string name="barcode">Штрих-код</string>
     <string name="card">Карта</string>
     <string name="groupsList">Группы: <xliff:g>%s</xliff:g></string>
     <string name="moveDown">Переместить ниже</string>
@@ -131,7 +127,6 @@
     <string name="setBarcodeId">Указать значение</string>
     <string name="sameAsCardId">Как номер</string>
     <string name="barcodeId">Значение штрих-кода</string>
-    <string name="settings_max_font_size_scale">Максимальный размер шрифта</string>
     <string name="unsupportedBarcodeType">В настоящее время данный тип штрих-кодов не отображается. Его поддержка может быть добавлена в следующих версиях приложения.</string>
     <string name="wrongValueForBarcodeType">Недопустимое значение для выбранного типа штрих-кода</string>
     <string name="app_resources">Свободные сторонние ресурсы: <xliff:g id="app_resources_list">%s</xliff:g></string>
@@ -151,7 +146,7 @@
     <string name="backImageDescription">Задняя сторона</string>
     <string name="frontImageDescription">Лицевая сторона</string>
     <string name="photos">Фото</string>
-    <string name="importStocardMessage">Выберите для импортирования файл <i>***-sync.zip</i>.
+    <string name="importStocardMessage">Выберите для импортирования файл <i>***.zip</i>.
 \nЭтот файл можно получить по электронной почте от support@stocardapp.com, предварительно запросив экспорт ваших данных.</string>
     <string name="passwordRequired">Введите пароль</string>
     <string name="importStocard">Импорт из Stocard</string>
@@ -193,11 +188,9 @@
     <string name="app_contributors">Создано при поддержке: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="noGroupCards">Группа пуста</string>
     <string name="barcodeImageDescriptionWithType">Изображение штрих-кода <xliff:g>%s</xliff:g></string>
-    <string name="swipeToSwitchImages">Смахивание переключает изображения, долгое нажатие открывает в приложении галереи</string>
     <string name="sort_by_expiry">Срок действия</string>
     <string name="sort_by">Сортировать по</string>
     <string name="reverse">…в обратном порядке</string>
-    <string name="sort_by_balance">Баланс</string>
     <string name="sort_by_most_recently_used">Частота использования</string>
     <string name="sort_by_name">Название</string>
     <string name="sort">Сортировка</string>
@@ -226,8 +219,6 @@
     <string name="translate_platform">на Weblate</string>
     <string name="shortcutSelectCard">Выбор карты</string>
     <string name="options">Параметры</string>
-    <string name="set_scale">Выбор масштаба</string>
-    <string name="hideMoreInfo">Скрыть данные</string>
     <string name="showMoreInfo">Показать данные</string>
     <string name="starred">Избранное</string>
     <plurals name="balancePoints">
@@ -277,4 +268,19 @@
     <string name="updateBalanceHint">Введите сумму</string>
     <string name="updateBalanceTitle">Какое изменение\?</string>
     <string name="importCards">Импорт карт</string>
+    <string name="storageReadPermissionRequired">Для этого действия необходимо разрешение на чтение хранилища…</string>
+    <string name="cameraPermissionRequired">Для этого действия необходимо разрешение на доступ к камере…</string>
+    <string name="validFromDate">Действует с</string>
+    <string name="anyDate">Любая дата</string>
+    <string name="chooseValidFromDate">Выбор даты действия</string>
+    <string name="validFromSentence">Действует с: <xliff:g>%s</xliff:g></string>
+    <string name="setBarcodeHeight">Указать высоту штрих-кода</string>
+    <string name="height">Высота:</string>
+    <string name="switchToBarcode">Переключить на штрих-код</string>
+    <string name="switchToFrontImage">Переключить на лицевую сторону</string>
+    <string name="switchToBackImage">Переключить на заднюю сторону</string>
+    <string name="openFrontImageInGalleryApp">Открыть лицевое изображение в приложении галереи</string>
+    <string name="openBackImageInGalleryApp">Открыть заднее изображение в приложении галереи</string>
+    <string name="donate">Пожертвовать</string>
+    <string name="icon_header_click_text">Долгое нажатие для редактирования значка</string>
 </resources>

app/src/main/res/values-sk/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_add">Pridať</string>
-    <string name="noGiftCards">Zatiaľ nemáte žiadne vernostné karty. Kliknite na tlačidlo \"+\" (plus) vyššie a začnite.\n\nAplikácia Vernostné karty umožňuje nosiť svoje vernostné karty v telefóne, kde sú vždy na dosah.</string>
+    <string name="noGiftCards">Ak chcete pridať kartu, kliknite na tlačidlo + plus alebo ju importujte z ⋮ ponuky.</string>
     <string name="storeName">Názov</string>
     <string name="note">Poznámka</string>
     <string name="cardId">ID karty</string>
@@ -15,38 +15,36 @@
     <string name="sendLabel">Odoslať…</string>
     <string name="editCardTitle">Upraviť kartu</string>
     <string name="addCardTitle">Pridať kartu</string>
-    <string name="scanCardBarcode">Zosnímajte čiarový kód na karte</string>
+    <string name="scanCardBarcode">Skenovať čiarový kód</string>
     <string name="cardShortcut">Skratka</string>
     <string name="noCardsMessage">Najprv pridajte kartu</string>
-    <string name="noStoreError">Nebol zadaný obchod</string>
+    <string name="noStoreError">Nebol zadaný žiadny názov</string>
     <string name="noCardIdError">Nebolo zadané ID</string>
     <string name="noCardExistsError">Nepodarilo sa nájsť túto kartu</string>
     <string name="importExport">Import/Export</string>
     <string name="exportName">Export</string>
-    <string name="importExportHelp">Zálohovanie dát Vám umožní presunúť Vaše uložené karty na iné zariadenie.</string>
+    <string name="importExportHelp">Zálohovanie vašich údajov umožňuje ich presun na iné zariadenie.</string>
     <string name="importSuccessfulTitle">Importované</string>
     <string name="importFailedTitle">Import zlyhal</string>
-    <string name="importFailed">Zlyhal import</string>
+    <string name="importFailed">Nemožno vykonať import</string>
     <string name="exportSuccessfulTitle">Exportované</string>
     <string name="exportFailedTitle">Export zlyhal</string>
-    <string name="exportFailed">Zlyhal export</string>
+    <string name="exportFailed">Nemožno vykonať export</string>
     <string name="importing">Importujem…</string>
     <string name="exporting">Exportujem…</string>
-    <string name="noExternalStoragePermissionError">Nie je možné importovať a exportovať karty bez prístupu k externému úložisku</string>
     <string name="importOptionFilesystemTitle">Import zo súborového systému</string>
     <string name="importOptionFilesystemExplanation">Vyberte súbor zo súborového systému.</string>
     <string name="importOptionFilesystemButton">Zo súborového systému</string>
-    <string name="importOptionApplicationTitle">Použite externú aplikáciu</string>
-    <string name="importOptionApplicationExplanation">Na otvorenie súboru použite externú aplikáciu, ako Dropbox, Disk Google, alebo Vášho obľúbeného správcu súborov.</string>
-    <string name="importOptionApplicationButton">Použiť externú aplikáciu</string>
+    <string name="importOptionApplicationTitle">Použite inú aplikáciu</string>
+    <string name="importOptionApplicationExplanation">Na otvorenie súboru použite ľubovoľnú aplikáciu alebo obľúbeného správcu súborov.</string>
+    <string name="importOptionApplicationButton">Použiť inú aplikáciu</string>
     <string name="about">O aplikácii</string>
-    <string name="app_license">Licencované GPLv3.</string>
+    <string name="app_license">Copyleftovaný slobodný softvér s licenciou GPLv3+</string>
     <string name="about_title_fmt">O <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Verzia: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Informácia pri revízii: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Vyberte čiarový kód</string>
-    <string name="copy_to_clipboard_toast">ID karty skopírované do schránky</string>
-    <string name="thumbnailDescription">Náhľad karty</string>
+    <string name="copy_to_clipboard_toast">ID skopírované do schránky</string>
+    <string name="thumbnailDescription">Miniatúra</string>
     <string name="settings">Nastavenia</string>
     <string name="settings_category_title_ui">Používateľské prostredie</string>
     <string name="settings_display_barcode_max_brightness">Zvýšiť jas pri zobrazení čiarového kódu </string>
@@ -54,22 +52,21 @@
     <string name="deleteConfirmation">Naozaj chcete túto kartu odstrániť?</string>
     <string name="star">Pridať k obľúbeným</string>
     <string name="noBarcode">Žiadny čiarový kód</string>
-    <string name="barcodeNoBarcode">Táto karta nemá čiarový kód</string>
+    <string name="barcodeNoBarcode">Čiarový kód nie je k dispozícii</string>
     <string name="barcodeType">Typ čiarových kódov</string>
-    <string name="noMatchingGiftCards">Nenašiel som nič. Skúste zmeniť vyhľadávanie.</string>
+    <string name="noMatchingGiftCards">Žiadne výsledky. Skúste zmeniť vyhľadávanie.</string>
     <string name="action_search">Vyhľadávanie</string>
-    <string name="chooseImportType">Importovať údaje z\?</string>
+    <string name="chooseImportType">Importovať údaje z</string>
     <string name="points">Body</string>
     <string name="currency">Mena</string>
     <string name="balance">Vyváženie</string>
     <string name="errorReadingImage">Obrázok sa nepodarilo prečítať</string>
     <string name="noBarcodeFound">Nenašiel sa žiadny čiarový kód</string>
-    <string name="moveBarcodeToCenterOfScreen">Vycentrovanie čiarového kódu na obrazovke</string>
     <string name="moveBarcodeToTopOfScreen">Presun čiarového kódu do hornej časti obrazovky</string>
     <string name="chooseExpiryDate">Zvoľte dátum skončenia platnosti</string>
     <string name="never">Nikdy</string>
     <string name="addFromImage">Vyberte obrázok z galérie</string>
-    <string name="addManually">Ručné zadanie ID karty</string>
+    <string name="addManually">Ručné zadanie ID</string>
     <string name="leaveWithoutSaveConfirmation">Odísť bez uloženia\?</string>
     <string name="leaveWithoutSaveTitle">Výstup</string>
     <string name="moveDown">Pohyb smerom nadol</string>
@@ -77,16 +74,15 @@
     <string name="failedOpeningFileManager">Najprv nainštalujte správcu súborov.</string>
     <string name="deleteConfirmationGroup">Vymazať skupinu\?</string>
     <string name="all">Všetky</string>
-    <string name="noGroupCards">Táto skupina neobsahuje karty</string>
-    <string name="noGroups">Ak chcete najprv pridať skupiny na kategorizáciu, kliknite na tlačidlo + plus.</string>
+    <string name="noGroupCards">Táto skupina je prázdna</string>
+    <string name="noGroups">Kliknutím na tlačidlo + plus pridáte skupiny na kategorizáciu.</string>
     <string name="groups">Skupiny</string>
     <string name="enter_group_name">Zadajte názov skupiny</string>
-    <string name="exportSuccessful">Export údajov z karty</string>
-    <string name="importSuccessful">Import údajov z karty</string>
+    <string name="exportSuccessful">Údaje exportované</string>
+    <string name="importSuccessful">Údaje importované</string>
     <string name="intent_import_card_from_url_share_text">Chcem sa s vami podeliť o pohľadnicu</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Zabráňte uzamknutiu obrazovky</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Zabrániť uzamknutiu obrazovky</string>
     <string name="settings_keep_screen_on">Nechajte obrazovku zapnutú</string>
-    <string name="settings_max_font_size_scale">Maximálna veľkosť písma</string>
     <string name="card_ids_copied">Skopírované ID</string>
     <string name="unstar">Odstrániť z obľúbených</string>
     <string name="settings_dark_theme">Tmavé</string>
@@ -94,7 +90,7 @@
     <string name="settings_system_theme">Systém</string>
     <string name="settings_theme">Téma</string>
     <string name="starImage">Obľúbená hviezda</string>
-    <string name="enterBarcodeInstructions">Zadajte ID karty a vyberte typ čiarového kódu nižšie alebo \"Táto karta nemá čiarový kód\".</string>
+    <string name="enterBarcodeInstructions">Zadajte ID a vyberte typ čiarového kódu nižšie alebo \"Nie je tu žiadny čiarový kód\".</string>
     <string name="exportOptionExplanation">Údaje sa zapíšu na vami zvolené miesto.</string>
     <string name="failedParsingImportUriError">Nepodarilo sa analyzovať import URI</string>
     <string name="share">Zdieľať</string>
@@ -141,7 +137,6 @@
     <string name="turn_flashlight_on">Zapnúť svetlo</string>
     <string name="sort_by_name">Názov</string>
     <string name="sort_by_most_recently_used">Naposledy použité</string>
-    <string name="sort_by_balance">Zostatok</string>
     <string name="reverse">…v obrátenom poradí</string>
     <string name="on_github">na GitHube</string>
     <string name="sort_by_expiry">Koniec platnosti</string>
@@ -152,7 +147,6 @@
     <string name="report_error">Nahlásiť chybu</string>
     <string name="translate_platform">na Weblate</string>
     <string name="showMoreInfo">Zobraziť podrobnosti</string>
-    <string name="hideMoreInfo">Skryť podrobnosti</string>
     <string name="action_hide_details">Skryť detaily</string>
     <string name="yes">Áno</string>
     <string name="importStocard">Import z aplikácie Stocard</string>
@@ -183,7 +177,6 @@
 \ncopyright © 2016–2020 Branden Archer</string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="expiryDate">Platnosť</string>
-    <string name="barcode">Čiarový kód</string>
     <string name="editBarcode">Upraviť čiarový kód</string>
     <string name="privacy_policy">Zásady ochrany osobných údajov</string>
     <string name="importVoucherVault">Import z Voucher Vault</string>
@@ -205,5 +198,73 @@
     <string name="passwordRequired">Zadajte prosím heslo</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> sa nezdá byť platným zostatkom.</string>
     <string name="noGiftCardsGroup">Zatiaľ nemáte žiadne vernostné karty. Keď nejaké pridáte, môžete ich priradiť ku skupine tu.</string>
-    <string name="noCameraPermissionDirectToSystemSetting"></string>
+    <string name="noCameraPermissionDirectToSystemSetting">Na skenovanie čiarových kódov potrebuje Catima prístup k fotoaparátu. Ťuknite sem a zmeňte nastavenia oprávnení.</string>
+    <string name="importCards">Importovať karty</string>
+    <string name="settings_card_orientation">Orientácia čiarového kódu</string>
+    <string name="settings_lock_on_opening_orientation">Zamknúť na orientáciu použitú pri otváraní karty</string>
+    <string name="app_loyalty_card_keychain">Kľúčenka vernostných kariet</string>
+    <string name="settings_oled_dark">Čisto čierne pozadie pre tmavú tému</string>
+    <string name="failedToRetrieveImageFile">Nepodarilo sa získať súbor obrázku</string>
+    <string name="updateBalance">Aktualizovať zostatok</string>
+    <string name="and_data_usage">a využitie dát</string>
+    <string name="options">Možnosti</string>
+    <string name="starred">S hviezdičkou</string>
+    <string name="duplicateCard">Duplikovať</string>
+    <string name="archive">Archivovať</string>
+    <string name="unarchive">Vrátiť z archivu</string>
+    <string name="archived">Karta archivovaná</string>
+    <string name="unarchived">Karta vrátená z archívu</string>
+    <string name="previousCard">Predošlá</string>
+    <string name="nextCard">Nasledujúca</string>
+    <string name="updateBalanceTitle">Koľko ste minuli\?</string>
+    <string name="updateBalanceHint">Zadajte čiastku</string>
+    <string name="failedToOpenUrl">Najprv nainštalujte webový prehliadač</string>
+    <string name="welcome">Vitajte v Catima</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> bod</item>
+        <item quantity="few"><xliff:g>%s</xliff:g> body</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> bodov</item>
+    </plurals>
+    <string name="validFromDate">Platnosť od</string>
+    <string name="anyDate">Akýkoľvek dátum</string>
+    <string name="chooseValidFromDate">Zvoliť dátum platné od</string>
+    <string name="validFromSentence">Platnosť od: <xliff:g>%s</xliff:g></string>
+    <string name="cameraPermissionRequired">Pre túto akciu je potrebné oprávnenie na prístup k fotoaparátu…</string>
+    <string name="privacy_policy_popup_text">Oznámenie o zásadách ochrany osobných údajov (vyžaduje sa v niektorých obchodoch s aplikáciami):
+\n
+\nNEZHROMAŽĎUJÚ SA VÔBEC ŽIADNE ÚDAJE, čo môže ktokoľvek potvrdiť, keďže naša aplikácia je slobodný softvér.</string>
+    <string name="importLoyaltyCardKeychainMessage">Vyberte svoj export <i>LoyaltyCardKeychain.csv</i> z Kľúčenky vernostných kariet, ktorý chcete importovať.
+\nVytvorte ho z ponuky Import/Export v aplikácii Loyalty Card Keychain tak, že tam najprv stlačíte tlačidlo Exportovať.</string>
+    <string name="importVoucherVaultMessage">Vyberte svoj <i>vouchervault.json</i> export z Trezoru poukážok pre import.
+\nNajprv ho vytvorte stlačením tlačidla Export v aplikácii Voucher Vault.</string>
+    <string name="shortcutSelectCard">Vybrať kartu</string>
+    <string name="include_if_asking_support">Ak chcete požiadať o podporu, uveďte nasledujúce informácie:</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> karta (<xliff:g id="archivedCount">%2$d</xliff:g> archivovaná)</item>
+        <item quantity="few"><xliff:g>%1$d</xliff:g> karty (<xliff:g id="archivedCount">%2$d</xliff:g> archivované)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> kariet (<xliff:g id="archivedCount">%2$d</xliff:g> archivovaných)</item>
+    </plurals>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Zobraziť archív (<xliff:g>%1$d</xliff:g> karta)</item>
+        <item quantity="few">Zobraziť archív (<xliff:g>%1$d</xliff:g> karty)</item>
+        <item quantity="other">Zobraziť archív (<xliff:g>%1$d</xliff:g> kariet)</item>
+    </plurals>
+    <string name="barcodeLongPressMessage">V aplikácii galéria je možné otvoriť iba obrázky</string>
+    <string name="cameraPermissionDeniedTitle">Nepodarilo sa získať prístup k fotoaparátu</string>
+    <string name="storageReadPermissionRequired">Pre túto akciu je potrebné oprávnenie na čítanie úložiska…</string>
+    <string name="settings_follow_system_orientation">Podľa systému</string>
+    <string name="settings_portrait_orientation">Na výšku</string>
+    <string name="settings_landscape_orientation">Na šírku</string>
+    <string name="importFidmeMessage">Vyberte svoj <i>fidme-export-request-xxxxxx.zip</i> export zo služby FidMe pre import a potom vyberte typy čiarových kódov ručne.
+\nVytvorte ho z profilu FidMe tak, že najprv vyberiete položku Ochrana údajov a potom stlačíte tlačidlo Extrahovať moje údaje.</string>
+    <string name="importStocardMessage">Vyberte svoj <i>***.zip</i> export zo Stocard pre import.
+\nZískate ho zaslaním e-mailu na adresu support@stocardapp.com, v ktorom požiadate o export svojich údajov.</string>
+    <string name="currentBalanceSentence">Aktuálny zostatok: <xliff:g>%s</xliff:g></string>
+    <string name="copy_to_clipboard_multiple_toast">ID skopírované do schránky</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Chcem sa s vami zdielať karty</string>
+    <string name="app_contributors">Podporili: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="archiveList">Archív</string>
+    <string name="noUnarchivedCardsMessage">Nie sú žiadne karty vrátené z archívu</string>
+    <string name="newBalanceSentence">Nový zostatok: <xliff:g>%s</xliff:g></string>
+    <string name="failedLaunchingPhotoPicker">Nepodarilo sa nájsť podporovanú aplikáciu galérie</string>
 </resources>

app/src/main/res/values-sl/strings.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_add">Dodaj</string>
-    <string name="noGiftCards">Trenutno nimate shranjene nobene kartice zvestobe. Kliknite  \"+\" (plus) na vrhu, da jih dodate.\n\n Aplikacija Kartice zvestobe Vam omogoča, da imate kartice zvestobe shranjene na Vašem telefonu in vedno v dosegu roke.</string>
-    <string name="storeName">Shrani</string>
+    <string name="noGiftCards">Pritisnite gumb + za dodajanje nove kartice ali gumb⋮v meniju za uvoz baze kartic iz datoteke.</string>
+    <string name="storeName">Ime</string>
     <string name="note">Zabeležka</string>
     <string name="cardId">Št. kartice</string>
     <string name="cancel">Prekliči</string>
@@ -18,35 +18,33 @@
     <string name="scanCardBarcode">Skeniraj črtno kodo</string>
     <string name="cardShortcut">Bližnjica do kartice</string>
     <string name="noCardsMessage">Najprej dodajte kartico</string>
-    <string name="noStoreError">Ime trgovine ni bilo vnešeno</string>
-    <string name="noCardIdError">Številka kartice ni bila vnešena</string>
-    <string name="noCardExistsError">Te kartice zvestobe ni bilo moč najti</string>
+    <string name="noStoreError">Ime ni bilo vnešeno</string>
+    <string name="noCardIdError">ID številka kartice ni bila vnešena</string>
+    <string name="noCardExistsError">Te kartice zvestobe ni bilo mogoče najti</string>
     <string name="importExport">Uvozi/izvozi</string>
     <string name="exportName">Izvozi</string>
-    <string name="importExportHelp">Varnostna kopija omogoča varen prenos kartic na druge naprave.</string>
+    <string name="importExportHelp">Varnostna kopija podatkovne baze kartic zvestobe omogoča prenos baze kartic tudi na drugo napravo.</string>
     <string name="importSuccessfulTitle">Uvoz je bil uspešen</string>
     <string name="importFailedTitle">Uvoz ni uspel</string>
-    <string name="importFailed">Napaka pri uvozu</string>
+    <string name="importFailed">Napaka pri uvozu baze</string>
     <string name="exportSuccessfulTitle">Izvoz je uspel</string>
     <string name="exportFailedTitle">Izvoz ni uspel</string>
-    <string name="exportFailed">Napaka pri izvozu</string>
+    <string name="exportFailed">Napaka pri izvozu baze</string>
     <string name="importing">Uvažanje…</string>
     <string name="exporting">Izvažanje…</string>
-    <string name="noExternalStoragePermissionError">Izvažanje in uvažanje je nemogoče brez omogočenega dostopa do zunanje shrambe</string>
     <string name="importOptionFilesystemTitle">Uvozi iz datotečnega sistema</string>
     <string name="importOptionFilesystemExplanation">Izberite specifično datoteko iz datotečnega sistema.</string>
     <string name="importOptionFilesystemButton">Iz datotečnega sistema</string>
-    <string name="importOptionApplicationTitle">Uporabi zunanjo aplikacijo</string>
+    <string name="importOptionApplicationTitle">Uporabi drugo aplikacijo</string>
     <string name="importOptionApplicationExplanation">Uporabi zunanjo aplikacijo, kot npr. Dropbox, Google Drive ali ostale upravljalnike datotek, za odpiranje datoteke.</string>
-    <string name="importOptionApplicationButton">Uporabi zunanjo aplikacijo</string>
+    <string name="importOptionApplicationButton">Uporabi drugo aplikacijo</string>
     <string name="about">Več o aplikaciji</string>
-    <string name="app_license">Licencirano s skladu z GPLv3.</string>
+    <string name="app_license">Odprtokodna programska oprema, licencirana skladno s GPL3+</string>
     <string name="about_title_fmt">Več o <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Verzija: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Informacije o popravkih: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Izberite črtno kodo</string>
-    <string name="copy_to_clipboard_toast">Številka kartice je bila kopirana v odložišče</string>
-    <string name="thumbnailDescription">Ikona kartice</string>
+    <string name="copy_to_clipboard_toast">ID številka je kopirana v odložišče</string>
+    <string name="thumbnailDescription">Sličica</string>
     <string name="settings">Nastavitve</string>
     <string name="settings_category_title_ui">Uporabniški vmesnik</string>
     <string name="settings_display_barcode_max_brightness">Povečaj osvetljenost prikaza črtne kode</string>
@@ -54,7 +52,7 @@
     <string name="deleteConfirmation">Prosim potrdite, če želite izbrisati to kartico\?</string>
     <string name="card">Kartica</string>
     <string name="addFromImage">Izberite sliko iz galerije</string>
-    <string name="addManually">Ročno vnesite št. kartice</string>
+    <string name="addManually">Ročno vnesite ID kartice</string>
     <string name="leaveWithoutSaveConfirmation">Zapustite brez shranjevanja\?</string>
     <string name="leaveWithoutSaveTitle">Izhod</string>
     <string name="moveDown">Premikanje navzdol</string>
@@ -62,33 +60,33 @@
     <string name="failedOpeningFileManager">Najprej namestite upravitelja datotek.</string>
     <string name="deleteConfirmationGroup">Brisanje skupine\?</string>
     <string name="all">Vse</string>
-    <string name="noGroupCards">Ta skupina ne vsebuje kartic</string>
-    <string name="noGroups">Kliknite gumb + plus, če želite najprej dodati skupine za kategorizacijo.</string>
+    <string name="noGroupCards">Ta skupina je prazna</string>
+    <string name="noGroups">Pritisnite gumb \"+\", če želite dodati skupine za kategorizacijo.</string>
     <string name="groups">Skupine</string>
     <string name="enter_group_name">Vnesite ime skupine</string>
-    <string name="exportSuccessful">Izvoženi podatki o karticah</string>
-    <string name="importSuccessful">Uvoženi podatki o karticah</string>
+    <string name="exportSuccessful">Podatkovna baza izvožena</string>
+    <string name="importSuccessful">Podatkovna baza uvožena</string>
     <string name="intent_import_card_from_url_share_text">Z vami želim deliti kartico</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Preprečitev zaklepanja zaslona</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Prepreči zaklepanje zaslona</string>
     <string name="settings_keep_screen_on">Ohranite zaslon vklopljen</string>
-    <string name="enterBarcodeInstructions">Vnesite ID kartice in spodaj izberite vrsto črtne kode ali \"Ta kartica nima črtne kode\".</string>
-    <string name="settings_max_font_size_scale">Največja velikost pisave</string>
+    <string name="enterBarcodeInstructions">Vnesite ID kartice in spodaj izberite vrsto črtne kode ali izbiro \"Ta kartica nima črtne kode\".</string>
     <string name="settings_dark_theme">Temno</string>
     <string name="settings_light_theme">Svetlo</string>
     <string name="settings_system_theme">Sistem</string>
     <string name="settings_theme">Tema</string>
     <string name="starImage">Zvezdica za priljubljene</string>
-    <string name="app_copyright_old">Na podlagi aplikacije Loyalty Card Keychain  copyright © 2016-2020 Branden Archer.</string>
+    <string name="app_copyright_old">Bazira na podlagi aplikacije Loyalty Card Keychain
+\ncopyright © 2016-2020 Branden Archer</string>
     <string name="exportOptionExplanation">Podatki bodo zapisani na izbrano mesto.</string>
     <string name="failedParsingImportUriError">Ni bilo mogoče razčleniti URI uvoza</string>
-    <string name="card_ids_copied">Kopirana kartica ID(s)</string>
+    <string name="card_ids_copied">Kopirana ID številka kartice</string>
     <string name="share">Delite</string>
     <string name="unstar">Odstrani iz priljubljenih</string>
     <string name="star">Dodaj med priljubljene</string>
     <string name="noBarcode">Brez črtne kode</string>
-    <string name="barcodeNoBarcode">Ta kartica nima črtne kode</string>
+    <string name="barcodeNoBarcode">Ni črtne kode</string>
     <string name="barcodeType">Vrsta črtne kode</string>
-    <string name="noMatchingGiftCards">Ničesar nisem našel. Poskusite spremeniti iskanje.</string>
+    <string name="noMatchingGiftCards">Brez rezultata iskanja. Poskusite spremeniti iskalni niz.</string>
     <string name="action_search">Iskanje</string>
     <string name="exportPasswordHint">Vnesite geslo</string>
     <string name="exportPassword">Izberite geslo za zaščito izvoza (neobvezno)</string>
@@ -105,11 +103,9 @@
     <string name="settings_theme_color">Barva teme</string>
     <string name="settings_system_locale">Sistem</string>
     <string name="settings_locale">Jezik</string>
-    <string name="barcodeImageDescriptionWithType">Slika črtne kode tipa <xliff:g>%s</xliff:g></string>
-    <string name="swipeToSwitchImages">Povlecite ali dolgo pritisnite da zamenjate slike</string>
+    <string name="barcodeImageDescriptionWithType">Slika <xliff:g>%s</xliff:g> črtna koda</string>
     <string name="sort_by">Razvrsti po</string>
-    <string name="reverse">Obratno</string>
-    <string name="sort_by_balance">Stanje</string>
+    <string name="reverse">...v obratnem vrstnem redu</string>
     <string name="sort_by_expiry">Potek</string>
     <string name="sort_by_most_recently_used">Nazadnje uporabljene</string>
     <string name="sort_by_name">Ime</string>
@@ -127,7 +123,7 @@
     <string name="errorReadingImage">Slike ni bilo mogoče prebrati</string>
     <string name="noBarcodeFound">Črtna koda ni bila najdena</string>
     <string name="balanceSentence">Stanje: <xliff:g>%s</xliff:g></string>
-    <string name="chooseImportType">Uvoz iz?</string>
+    <string name="chooseImportType">Uvozi podatke iz</string>
     <string name="importCatima">Izvoz iz aplikacije Catima</string>
     <string name="importStocard">Izvoz iz aplikacije Stocard</string>
     <string name="importVoucherVault">Izvoz iz aplikacije Voucher Vault</string>
@@ -138,23 +134,144 @@
     <string name="accept">Sprejmi</string>
     <string name="importLoyaltyCardKeychain">Uvoz iz aplikacije Loyalty Card Keychain</string>
     <string name="barcodeId">Vsebina črtne kode</string>
-    <string name="sameAsCardId">Enaka kot številka kartice</string>
+    <string name="sameAsCardId">Enaka kot ID kartice</string>
     <string name="setBarcodeId">Nastavi vsebino črtne kode</string>
     <string name="wrongValueForBarcodeType">Ta vrednost ni veljavna pri izbranem tipu čtne kode</string>
     <string name="takePhoto">Naredi fotografijo</string>
     <string name="intent_import_card_from_url_share_multiple_text">Z vami želim deliti kartice zvestobe</string>
-    <string name="copy_to_clipboard_multiple_toast">Številke kartic kopirane v odložišče</string>
+    <string name="copy_to_clipboard_multiple_toast">ID številke kartic so kopirane v odložišče</string>
     <string name="importFidme">Uvoz iz aplikacije FidMe</string>
     <string name="no">Ne</string>
     <string name="yes">Da</string>
-    <string name="frontImageDescription">Slika sprednje strani</string>
-    <string name="backImageDescription">Slika zadnje strani</string>
+    <string name="frontImageDescription">Prednja stran</string>
+    <string name="backImageDescription">Zadnja stran</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> ni veljavno stanje.</string>
     <string name="setBackImage">Nastavi sliko sprednje strani</string>
     <string name="setFrontImage">Nastavi sliko sprednje strani</string>
     <string name="photos">Fotografije</string>
-    <string name="updateBarcodeQuestionText">Spremenili ste številko kartice. Želite posodobiti tudi črtno kodo na enako vrednost?</string>
+    <string name="updateBarcodeQuestionText">Spremenili ste ID kartice. Želite posodobiti tudi črtno kodo na enako vrednost\?</string>
     <string name="updateBarcodeQuestionTitle">Posodobi črtno kodo?</string>
     <string name="removeImage">Odstrani sliko</string>
     <string name="unsupportedBarcodeType">Te vrste črtne kode aplikacija ne more prikazati. Morda bo to možno v prihodnosti.</string>
+    <string name="shortcutSelectCard">Izberite kartico</string>
+    <string name="starred">Priljubljene</string>
+    <string name="include_if_asking_support">Ob zahtevani pomoči podpore je potrebno vključiti naslednje informacije:</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> točka</item>
+        <item quantity="two"><xliff:g>%s</xliff:g> točki</item>
+        <item quantity="few"><xliff:g>%s</xliff:g> točke</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> točk</item>
+    </plurals>
+    <string name="editBarcode">Uredi črtno kodo</string>
+    <string name="group_edit">Uredi skupino</string>
+    <string name="never">Nikoli</string>
+    <string name="importCards">Uvozite kartice</string>
+    <string name="currentBalanceSentence">Trenutno stanje: <xliff:g>%s</xliff:g></string>
+    <string name="newBalanceSentence">Novo stanje: <xliff:g>%s</xliff:g></string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> izbrana</item>
+        <item quantity="two"><xliff:g>%d</xliff:g> izbrani</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> izbrane</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> izbranih</item>
+    </plurals>
+    <string name="settings_card_orientation">Orientacija črtne kode</string>
+    <string name="settings_follow_system_orientation">Sledi sistemu</string>
+    <string name="settings_portrait_orientation">Podoba</string>
+    <string name="settings_landscape_orientation">Pokrajina</string>
+    <string name="settings_lock_on_opening_orientation">Ohrani usmerjenost uporabljeno pri odpiranju kartice</string>
+    <string name="setIcon">Nastavite ikono</string>
+    <string name="showMoreInfo">Prikaži informacije</string>
+    <string name="updateBalance">Posodobi stanje</string>
+    <string name="failedToRetrieveImageFile">Slikovne datoteke ni bilo mogoče pridobiti</string>
+    <string name="credits">Zasluge</string>
+    <string name="action_show_details">Prikaži podrobnosti</string>
+    <string name="translate_platform">na Weblate-u</string>
+    <string name="options">Možnosti</string>
+    <string name="duplicateCard">Podvoji</string>
+    <string name="archive">Arhiviraj</string>
+    <string name="unarchive">Odpakiraj arhiv</string>
+    <string name="archived">Karta arhivirana</string>
+    <string name="unarchived">Kartica ni arhivirana</string>
+    <string name="archiveList">Arhiv</string>
+    <string name="noUnarchivedCardsMessage">Ne obstajajo ne arhivirane kartice</string>
+    <string name="failedLaunchingPhotoPicker">Ni mogoče najti podprte aplikacije za gledanje slik</string>
+    <string name="previousCard">Prejšnje</string>
+    <string name="nextCard">Naslednje</string>
+    <string name="updateBalanceTitle">Koliko ste porabili\?</string>
+    <string name="updateBalanceHint">Vpišite vrednost</string>
+    <string name="group_name_already_in_use">Ime skupine je že uporabljeno</string>
+    <string name="group_name_is_empty">Ime skupine ne more biti prazno polje</string>
+    <string name="group_updated">Skupina posodobljena</string>
+    <string name="groupsList">Skupine: <xliff:g>%s</xliff:g></string>
+    <string name="app_libraries">Proste knjižnice tretjih oseb: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Prosti viri tretjih oseb: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="expiryStateSentence">Poteče: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Poteklo: <xliff:g>%s</xliff:g></string>
+    <string name="expiryDate">Datum poteka veljavnosti</string>
+    <string name="chooseExpiryDate">Izberi datum poteka veljavnosti</string>
+    <string name="moveBarcodeToTopOfScreen">Premakni črtno kodo na vrh zaslona</string>
+    <string name="importCatimaMessage">Izberi svoj obstoječ Catima <i>catima.zip</i> izvoz podatkov za uvoz v aplikacijo.
+\nNajprej izvozi podatke v meniju \"Uvozi/Izvozi\" v drugi aplikaciji Catima s pritiskom na izbiro izvozi.</string>
+    <string name="importStocardMessage">Izberi svoj <i>***.zip</i> Stocard izvoz podatkov za uvoz.
+\nIzvoz podatkov dobiš s pošiljanjem elektronske pošte na support@stocardapp.com, kjer povprašaš za izvoz svojih podatkov.</string>
+    <string name="importVoucherVaultMessage">Izberi svoj <i>vouchervault.json</i> Voucher Vault izvoz podatkov za uvoz.
+\nIzvoz podatkov dobiš s pritiskom na gumb \"Export\" v Voucher Vault first.</string>
+    <string name="failedToOpenUrl">Prvo namestite spletni brskalnik</string>
+    <string name="welcome">Pozdravljeni v Catimi</string>
+    <string name="noGiftCardsGroup">Kreiraj kartice in jim dodeli skupino tukaj.</string>
+    <string name="privacy_policy_popup_text">Obvestilo o politiki zasebnosti (nekatere trgovine aplikacij to zahtevajo):
+\n
+\nPODATKI SE NE ZBIRAJO, kar se lahko preveri v programski kodi, saj je aplikacija prosta programska oprema.</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Izbriši <xliff:g>%d</xliff:g> kartico zvestobe</item>
+        <item quantity="two">Izbriši <xliff:g>%d</xliff:g> kartici zvestobe</item>
+        <item quantity="few">Izbriši <xliff:g>%d</xliff:g> kartice zvestobe</item>
+        <item quantity="other">Izbriši <xliff:g>%d</xliff:g> kartic zvestobe</item>
+    </plurals>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Izbriši to <xliff:g>%d</xliff:g> kartico zvestobe dokončno\?</item>
+        <item quantity="two">Izbriši ti dve <xliff:g>%d</xliff:g> kartici zvestobe dokončno\?</item>
+        <item quantity="few">Izbriši te <xliff:g>%d</xliff:g> kartice zvestobe dokončno\?</item>
+        <item quantity="other">Izbriši teh <xliff:g>%d</xliff:g> kartic zvestobe dokončno\?</item>
+    </plurals>
+    <string name="cameraPermissionDeniedTitle">Ni bilo mogoče dostopati do kamere</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Catima potrebuje dostop do vaše kamere za skeniranje črtnih kod. Pritisnite tukaj in spremenite nastavitve dovoljenj.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> kartica</item>
+        <item quantity="two"><xliff:g>%d</xliff:g> kartici</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> kartice</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kartic</item>
+    </plurals>
+    <string name="editGroup">Urejanje skupine: <xliff:g>%s</xliff:g></string>
+    <string name="importFidmeMessage">Izberi svoj <i>fidme-export-request-xxxxxx.zip</i> FidMe izvoz podatkov za uvoz in naknadno ročno izberi tipe črtnih kod.
+\nFidMe izvoz podatkov naredi v svojem FidMe profilu z izbiro \"Data Protection\" in nato s pritiskom na gumb \"Extract my data first\".</string>
+    <string name="importLoyaltyCardKeychainMessage">Izberi svoj <i>LoyaltyCardKeychain.csv</i> Loyalty Card Keychain izvoz podatkov za uvoz.
+\nLoyalty Card Keychain izvoz podatkov naredi s pritiskom na gumb \"Import/Export\" v meniju s pritiskom najprej na gumb \"Export\".</string>
+    <string name="failedGeneratingShareURL">URL-ja za skupno rabo ni bilo mogoče ustvariti. Prosim prijavite napako.</string>
+    <string name="settings_oled_dark">Čisto črno ozadje za temno temo</string>
+    <string name="selectColor">Izberite barvo</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="app_contributors">Omogočeno od: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="barcodeLongPressMessage">V aplikaciji za gledanje slik lahko odpremo samo slike</string>
+    <string name="action_hide_details">Skrij podrobnosti</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> kartica (<xliff:g id="archivedCount">%2$d</xliff:g> arhivirana)</item>
+        <item quantity="two"><xliff:g>%1$d</xliff:g> kartici (<xliff:g id="archivedCount">%2$d</xliff:g> arhivirani)</item>
+        <item quantity="few"><xliff:g>%1$d</xliff:g> kartice (<xliff:g id="archivedCount">%2$d</xliff:g> arhivirane)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> kartic (<xliff:g id="archivedCount">%2$d</xliff:g> arhiviranih)</item>
+    </plurals>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Poglej arhiv (<xliff:g>%1$d</xliff:g> kartice)</item>
+        <item quantity="two">Poglej arhiv (<xliff:g>%1$d</xliff:g> kartic)</item>
+        <item quantity="few">Poglej arhiv (<xliff:g>%1$d</xliff:g> kartic)</item>
+        <item quantity="other">Poglej arhiv (<xliff:g>%1$d</xliff:g> kartic)</item>
+    </plurals>
+    <string name="cameraPermissionRequired">Za to dejanje je potrebno dovoljenje za dostop do kamere…</string>
+    <string name="storageReadPermissionRequired">Za to dejanje je potrebno dovoljenje za branje iz pomnilnika…</string>
+    <string name="validFromSentence">Veljavno od: <xliff:g>%s</xliff:g></string>
+    <string name="validFromDate">Velja od</string>
+    <string name="anyDate">Katerikoli datum</string>
+    <string name="chooseValidFromDate">Izberite datum začetka veljavnosti</string>
 </resources>