Catch new UncheckedIOException

Bump org.apache.commons:commons-csv from 1.9.0 to 1.10.0
Bumps [org.apache.commons:commons-csv](https://github.com/apache/commons-csv) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/apache/commons-csv/releases) - [Changelog](https://github.com/apache/commons-csv/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-csv/compare/rel/commons-csv-1.9.0...rel/commons-csv-1.10.0) --- updated-dependencies: - dependency-name: org.apache.commons:commons-csv dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2025-12-24 23:57:53 -05:00 · 2023-04-18 19:58:40 +02:00 · 2023-04-18 16:58:12 +00:00
592 changed files with 1989 additions and 4358 deletions
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -10,9 +10,6 @@ on:
    branches:
      - main

-env:
-  JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
-
 jobs:
  build:

@@ -23,17 +20,17 @@ jobs:
    - name: Fail on bad translations
      run: if grep -ri "&lt;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 OpenJDK 17
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y openjdk-17-jdk-headless
-        sudo update-alternatives --auto java
+    - name: set up JDK 17
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'temurin'
+        java-version: '17'
    - name: Build
      run: ./gradlew assembleRelease
    - name: Check lint
      run: ./gradlew lintRelease
    - name: Run unit tests
-      run: timeout 5m ./gradlew testReleaseUnitTest || { ./gradlew --stop && timeout 5m ./gradlew testReleaseUnitTest; }
+      run: ./gradlew testReleaseUnitTest || ./gradlew testReleaseUnitTest
    - name: SpotBugs
      run: ./gradlew spotbugsRelease
    - name: Archive test results
--- a/.github/workflows/autoclose-needs-info.yml
+++ b/.github/workflows/autoclose-needs-info.yml
@@ -13,12 +13,12 @@ jobs:
    steps:
      - uses: actions/stale@v4
        with:
+          days-before-stale: -1
          days-before-close: 90
-          stale-issue-message: ""
-          stale-pr-message: ""
          close-issue-message: 'This issue is missing necessary information and cannot be worked on in its current state. It has therefore been closed to keep the issue tracker clean. If you have more information, feel free to reopen it.'
          close-pr-message: 'This PR is missing necessary information and cannot be merged in its current state. It has therefore been closed to keep the issue tracker clean. If you have more information, feel free to reopen it.'
          only-labels: 'state: needs info'
          stale-issue-label: 'state: needs info'
          stale-pr-label: 'state: needs info'
+          remove-stale-when-updated: false
          enable-statistics: true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,88 +1,48 @@
 # Changelog

-## v2.25.0 - 127 (2023-07-09)
-
- Barcode rendering improvements
- Basic interoperability with external apps (Android 6.0+)
- Reorganized settings screen
- Fix importing from some browsers that add a trailing / to the share URL
-
-## v2.24.2 - 126 (2023-06-18)
-
- Various RTL fixes
-
-## v2.24.1 - 125 (2023-06-11)
-
- Deal more gracefully with missing header colours
-
-## v2.24.0 - 124 (2023-06-10)
-
- Support selecting exactly which details to view in card overview
-
-## v2.23.3 - 123 (2023-06-03)
-
- Minor UI improvements
- Fix new design not being usable on devices with square screens
-
-## v2.23.2 - 122 (2023-05-30)
-
- 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 (2023-05-27)
-
- Update used libraries
-
-## v2.23.0 - 120 (2023-05-25)
-
- 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 (2023-04-14)
+## v2.22.1 - 119

 - Use Material You colours on more devices (Google library update)

-## v2.22.0 - 118 (2023-03-18)
+## v2.22.0 - 118

 - Support setting start of card validity
 - Fix Stocard import (Stocard's export format changed)

-## v2.21.2 - 117 (2023-01-27)
+## v2.21.2 - 117

 - Remove unnecessary permissions
 - Target Android 13

-## v2.21.1 - 116 (2022-12-06)
+## v2.21.1 - 116

 - Fix quick spend dialog not allowing , separator
 - Support loading image from file manager

-## v2.21.0 - 115 (2022-11-06)
+## v2.21.0 - 115

 - Open image in gallery on long-press
 - Apply Material style to dialogs
 - Support creating card by sharing an image to Catima
 - Add quick spend button to card screen

-## v2.20.0 - 114 (2022-09-21)
+## v2.20.0 - 114

 - Add Monochrome icon for Android 13
 - Improve first launch screen
 - Fidme import fixes

-## v2.19.0 - 113 (2022-08-14)
+## v2.19.0 - 113

 - Add previous and next buttons to the loyalty card view
 - Fix foreground colour on edit button
 - Replace floppy disk save icon with checkmark

-## v2.18.2 - 112 (2022-07-29)
+## v2.18.2 - 112

 - Make the possibility to set a custom header more visible

-## v2.18.1 - 111 (2022-07-24)
+## v2.18.1 - 111

 - Arabic language support
 - Display archived card count in group overview
@@ -92,11 +52,11 @@
 - Fix crash when leaving cardview in RTL layouts for cards with expiry or balance
 - Fix back arrow in card view pointing the wrong way in RTL layouts

-## v2.17.1 - 109 (2022-06-28)
+## v2.17.1 - 109

 - Fix incorrect text colour on "No barcode" button

-## v2.17.0 - 108 (2022-06-24)
+## v2.17.0 - 108

 - Add card duplication feature
 - Don't allow choosing expiry before 1970 (they never worked anyway)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,21 +3,21 @@ GEM
  specs:
    CFPropertyList (3.0.6)
      rexml
-    addressable (2.8.4)
+    addressable (2.8.1)
      public_suffix (>= 2.0.2, < 6.0)
    artifactory (3.0.15)
    atomos (0.1.3)
    aws-eventstream (1.2.0)
-    aws-partitions (1.771.0)
-    aws-sdk-core (3.173.1)
+    aws-partitions (1.701.0)
+    aws-sdk-core (3.170.0)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.651.0)
      aws-sigv4 (~> 1.5)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.64.0)
+    aws-sdk-kms (1.62.0)
      aws-sdk-core (~> 3, >= 3.165.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.122.0)
+    aws-sdk-s3 (1.119.0)
      aws-sdk-core (~> 3, >= 3.165.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
@@ -36,7 +36,7 @@ GEM
      unf (>= 0.0.5, < 1.0.0)
    dotenv (2.8.1)
    emoji_regex (3.2.3)
-    excon (0.99.0)
+    excon (0.98.0)
    faraday (1.10.3)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
@@ -65,8 +65,8 @@ GEM
    faraday-retry (1.0.3)
    faraday_middleware (1.2.0)
      faraday (~> 1.0)
-    fastimage (2.2.7)
-    fastlane (2.213.0)
+    fastimage (2.2.6)
+    fastlane (2.211.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, < 3.0.0)
+      multipart-post (~> 2.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.42.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.0)
+    google-apis-androidpublisher_v3 (0.32.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-core (0.10.0)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (>= 0.16.2, < 2.a)
      httpclient (>= 2.8.1, < 3.a)
@@ -117,10 +117,10 @@ GEM
      retriable (>= 2.0, < 4.a)
      rexml
      webrick
-    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-iamcredentials_v1 (0.16.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-playcustomapp_v1 (0.12.0)
+      google-apis-core (>= 0.9.1, < 2.a)
    google-apis-storage_v1 (0.19.0)
      google-apis-core (>= 0.9.0, < 2.a)
    google-cloud-core (1.6.0)
@@ -128,7 +128,7 @@ GEM
      google-cloud-errors (~> 1.0)
    google-cloud-env (1.6.0)
      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.1)
+    google-cloud-errors (1.3.0)
    google-cloud-storage (1.44.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
@@ -137,7 +137,7 @@ GEM
      google-cloud-core (~> 1.6)
      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (1.5.2)
+    googleauth (1.3.0)
      faraday (>= 0.17.3, < 3.a)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
@@ -150,17 +150,17 @@ GEM
    httpclient (2.8.3)
    jmespath (1.6.2)
    json (2.6.3)
-    jwt (2.7.0)
+    jwt (2.6.0)
    memoist (0.16.2)
    mini_magick (4.12.0)
    mini_mime (1.1.2)
    multi_json (1.15.0)
-    multipart-post (2.3.0)
+    multipart-post (2.0.0)
    nanaimo (0.3.0)
    naturally (2.2.1)
    optparse (0.1.1)
    os (1.1.4)
-    plist (3.7.0)
+    plist (3.6.0)
    public_suffix (5.0.1)
    rake (13.0.6)
    representable (3.2.0)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,8 +19,8 @@ android {
        applicationId "me.hackerchick.catima"
        minSdk 21
        targetSdk 33
-        versionCode 127
-        versionName "2.25.0"
+        versionCode 119
+        versionName "2.22.1"

        vectorDrawables.useSupportLibrary true
        multiDexEnabled true
@@ -90,18 +90,19 @@ dependencies {
    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.9.0'
+    implementation 'com.google.android.material:material:1.8.0'
    implementation 'com.github.yalantis:ucrop:2.2.8'
    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'

 // Splash Screen
-    implementation 'androidx.core:core-splashscreen:1.0.1'
+    implementation 'androidx.core:core-splashscreen:1.0.0'

 // Third-party
    implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
    implementation 'com.google.zxing:core:3.5.1'
-    implementation 'org.apache.commons:commons-csv:1.9.0'
+    implementation 'org.apache.commons:commons-csv:1.10.0'
    implementation 'com.jaredrummler:colorpicker:1.1.0'
+    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.4'
    implementation 'net.lingala.zip4j:zip4j:2.11.5'

 // SpotBugs
@@ -110,7 +111,7 @@ dependencies {
 // Testing
    testImplementation 'androidx.test:core:1.5.0'
    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.10.3'
+    testImplementation 'org.robolectric:robolectric:4.10'
 }

 tasks.withType(SpotBugsTask) {
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,13 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">

-    <permission
-        android:description="@string/permissionReadCardsDescription"
-        android:icon="@drawable/ic_launcher_foreground"
-        android:label="@string/permissionReadCardsLabel"
-        android:name="${applicationId}.READ_CARDS"
-        android:protectionLevel="dangerous" />
-
    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />

    <uses-permission android:name="android.permission.CAMERA" />
@@ -162,12 +155,6 @@
            android:name=".UCropWrapper"
            android:theme="@style/AppTheme.NoActionBar" />

-        <provider
-            android:name=".contentprovider.CardsContentProvider"
-            android:authorities="${applicationId}.contentprovider.cards"
-            android:exported="true"
-            android:readPermission="${applicationId}.READ_CARDS"/>
-
        <provider
            android:name="androidx.core.content.FileProvider"
            android:authorities="${applicationId}"
--- a/app/src/main/java/protect/card_locker/AboutActivity.java
+++ b/app/src/main/java/protect/card_locker/AboutActivity.java
@@ -39,13 +39,6 @@ public class AboutActivity extends CatimaAppCompatActivity {
        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();
    }
@@ -81,7 +74,6 @@ 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());
    }
@@ -94,8 +86,6 @@ 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);
    }

--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterResultCallback.java
+++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterResultCallback.java
@@ -1,5 +0,0 @@
-package protect.card_locker;
-
-public interface BarcodeImageWriterResultCallback {
-    void onBarcodeImageWriterResult(boolean success);
-}
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
+++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
@@ -41,15 +41,13 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
    private final CatimaBarcode format;
    private final int imageHeight;
    private final int imageWidth;
-    private final int imagePadding;
-    private final boolean widthPadding;
    private final boolean showFallback;
-    private final BarcodeImageWriterResultCallback callback;
+    private final Runnable callback;

    BarcodeImageWriterTask(
            Context context, ImageView imageView, String cardIdString,
            CatimaBarcode barcodeFormat, TextView textView,
-            boolean showFallback, BarcodeImageWriterResultCallback callback, boolean roundCornerPadding
+            boolean showFallback, Runnable callback, boolean roundCornerPadding
    ) {
        mContext = context;

@@ -63,39 +61,32 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
        cardId = cardIdString;
        format = barcodeFormat;

-        int imageViewHeight = imageView.getHeight();
-        int imageViewWidth = imageView.getWidth();
-
+        int padding = 0;
        // Some barcodes already have internal whitespace and shouldn't get extra padding
        // TODO: Get rid of this hack by somehow detecting this extra whitespace
        if (roundCornerPadding && !barcodeFormat.hasInternalPadding()) {
-            imagePadding = Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, context.getResources().getDisplayMetrics()));
-        } else {
-            imagePadding = 0;
-        }
-
-        if (format.isSquare() && imageViewWidth > imageViewHeight) {
-            imageViewWidth -= imagePadding;
-            widthPadding = true;
-        } else {
-            imageViewHeight -= imagePadding;
-            widthPadding = false;
+            padding = Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, context.getResources().getDisplayMetrics()));
        }

        final int MAX_WIDTH = getMaxWidth(format);

-        if (format.isSquare()) {
-            imageHeight = imageWidth = Math.min(imageViewHeight, Math.min(MAX_WIDTH, imageViewWidth));
-        } else if (imageView.getWidth() < MAX_WIDTH) {
-            imageHeight = imageViewHeight;
-            imageWidth = imageViewWidth;
+        int tempImageHeight;
+        int tempImageWidth;
+
+        if (imageView.getWidth() < MAX_WIDTH) {
+            tempImageHeight = imageView.getHeight();
+            tempImageWidth = imageView.getWidth();
        } else {
            // Scale down the image to reduce the memory needed to produce it
-            imageWidth = MAX_WIDTH;
-            double ratio = (double) MAX_WIDTH / (double) imageViewWidth;
-            imageHeight = (int) (imageViewHeight * ratio);
+            tempImageWidth = MAX_WIDTH;
+            double ratio = (double) MAX_WIDTH / (double) imageView.getWidth();
+            tempImageHeight = (int) (imageView.getHeight() * ratio);
        }

+        // Ensure space for padding if wanted
+        imageWidth = tempImageWidth;
+        imageHeight = tempImageHeight - padding;
+
        this.showFallback = showFallback;
    }

@@ -103,15 +94,12 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
        switch (format.format()) {
            // 2D barcodes
            case AZTEC:
+            case DATA_MATRIX:
            case MAXICODE:
            case PDF_417:
            case QR_CODE:
                return MAX_WIDTH_2D;

-            // 2D but rectangular versions get blurry otherwise
-            case DATA_MATRIX:
-                return MAX_WIDTH_1D;
-
            // 1D barcodes:
            case CODABAR:
            case CODE_39:
@@ -273,11 +261,6 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {

        if (result != null) {
            Log.i(TAG, "Displaying barcode");
-            if (widthPadding) {
-                imageView.setPadding(imagePadding / 2, 0, imagePadding / 2, 0);
-            } else {
-                imageView.setPadding(0, imagePadding / 2, 0, imagePadding / 2);
-            }
            imageView.setVisibility(View.VISIBLE);

            if (isSuccesful) {
@@ -299,7 +282,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
        }

        if (callback != null) {
-            callback.onBarcodeImageWriterResult(isSuccesful);
+            callback.run();
        }
    }

--- a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
+++ b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
@@ -81,7 +81,7 @@ public class CardShortcutConfigure extends CatimaAppCompatActivity implements Lo
    @Override
    public boolean onCreateOptionsMenu(Menu inputMenu) {
        getMenuInflater().inflate(R.menu.card_details_menu, inputMenu);
-
+        Utils.updateMenuCardDetailsButtonState(inputMenu.findItem(R.id.action_unfold), mAdapter.showingDetails());
        return super.onCreateOptionsMenu(inputMenu);
    }

@@ -89,8 +89,8 @@ public class CardShortcutConfigure extends CatimaAppCompatActivity implements Lo
    public boolean onOptionsItemSelected(MenuItem inputItem) {
        int id = inputItem.getItemId();

-        if (id == R.id.action_shown_details) {
-            mAdapter.showSelectDetailDisplayDialog();
+        if (id == R.id.action_unfold) {
+            mAdapter.showDetails(!mAdapter.showingDetails());
            invalidateOptionsMenu();

            return true;
--- a/app/src/main/java/protect/card_locker/CatimaBarcode.java
+++ b/app/src/main/java/protect/card_locker/CatimaBarcode.java
@@ -67,6 +67,7 @@ public class CatimaBarcode {

    public boolean isSquare() {
        return mBarcodeFormat == BarcodeFormat.AZTEC
+                || mBarcodeFormat == BarcodeFormat.DATA_MATRIX
                || mBarcodeFormat == BarcodeFormat.MAXICODE
                || mBarcodeFormat == BarcodeFormat.QR_CODE;
    }
--- a/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
@@ -7,7 +7,6 @@ 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;

@@ -18,6 +17,7 @@ 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,6 +25,7 @@ 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();
@@ -62,6 +63,8 @@ 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);
    }
@@ -85,7 +88,7 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro

    public static class GroupListItemViewHolder extends RecyclerView.ViewHolder {
        public TextView mName, mCardCount;
-        public Button mMoveUp, mMoveDown, mEdit, mDelete;
+        public ImageButton mMoveUp, mMoveDown, mEdit, mDelete;

        public GroupListItemViewHolder(GroupLayoutBinding groupLayoutBinding) {
            super(groupLayoutBinding.getRoot());
--- a/app/src/main/java/protect/card_locker/ImportURIHelper.java
+++ b/app/src/main/java/protect/card_locker/ImportURIHelper.java
@@ -46,11 +46,8 @@ public class ImportURIHelper {
    }

    private boolean isImportUri(Uri uri) {
-        // Remove trailing slash added by some browsers (if it exists)
-        final String uriPath = uri.getPath().replaceAll("/$", "");
-
        for (int i = 0; i < hosts.length; i++) {
-            if (uri.getHost().equals(hosts[i]) && uriPath.equals(paths[i])) {
+            if (uri.getHost().equals(hosts[i]) && uri.getPath().equals(paths[i])) {
                return true;
            }
        }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -18,14 +18,12 @@ import android.widget.TextView;

 import com.google.android.material.card.MaterialCardView;
 import com.google.android.material.color.MaterialColors;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;

 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.util.ArrayList;

 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.BlendModeColorFilterCompat;
@@ -33,23 +31,23 @@ import androidx.core.graphics.BlendModeCompat;
 import androidx.recyclerview.widget.RecyclerView;

 import protect.card_locker.databinding.LoyaltyCardLayoutBinding;
+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;
    protected SparseBooleanArray mSelectedItems;
    protected SparseBooleanArray mAnimationItemsIndex;
    private boolean mReverseAllAnimations = false;
-    private boolean mShowNameBelowThumbnail;
-    private boolean mShowNote;
-    private boolean mShowBalance;
-    private boolean mShowValidity;
+    private boolean mShowDetails;

    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();
@@ -62,100 +60,29 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
        swapCursor(inputCursor);
    }

-    private void saveDetailState(int stateId, boolean value) {
-        SharedPreferences cardDetailsPref = mContext.getSharedPreferences(
-                mContext.getString(R.string.sharedpreference_card_details),
-                Context.MODE_PRIVATE);
-        SharedPreferences.Editor cardDetailsPrefEditor = cardDetailsPref.edit();
-        cardDetailsPrefEditor.putBoolean(mContext.getString(stateId), value);
-        cardDetailsPrefEditor.apply();
-    }
-
    public void refreshState() {
        // Retrieve user details preference
        SharedPreferences cardDetailsPref = mContext.getSharedPreferences(
                mContext.getString(R.string.sharedpreference_card_details),
                Context.MODE_PRIVATE);
-        mShowNameBelowThumbnail = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_name_below_thumbnail), false);
-        mShowNote = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_note), true);
-        mShowBalance = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_balance), true);
-        mShowValidity = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_validity), true);
+        mShowDetails = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show), true);
    }

-    public void showNameBelowThumbnail(boolean show) {
-        mShowNameBelowThumbnail = show;
+    public void showDetails(boolean show) {
+        mShowDetails = show;
        notifyDataSetChanged();

-        saveDetailState(R.string.sharedpreference_card_details_show_name_below_thumbnail, show);
+        // Store in Shared Preference to restore next adapter launch
+        SharedPreferences cardDetailsPref = mContext.getSharedPreferences(
+                mContext.getString(R.string.sharedpreference_card_details),
+                Context.MODE_PRIVATE);
+        SharedPreferences.Editor cardDetailsPrefEditor = cardDetailsPref.edit();
+        cardDetailsPrefEditor.putBoolean(mContext.getString(R.string.sharedpreference_card_details_show), show);
+        cardDetailsPrefEditor.apply();
    }

-    public boolean showingNameBelowThumbnail() {
-        return mShowNameBelowThumbnail;
-    }
-
-    public void showNote(boolean show) {
-        mShowNote = show;
-        notifyDataSetChanged();
-
-        saveDetailState(R.string.sharedpreference_card_details_show_note, show);
-    }
-
-    public boolean showingNote() {
-        return mShowNote;
-    }
-
-    public void showBalance(boolean show) {
-        mShowBalance = show;
-        notifyDataSetChanged();
-
-        saveDetailState(R.string.sharedpreference_card_details_show_balance, show);
-    }
-
-    public boolean showingBalance() {
-        return mShowBalance;
-    }
-
-    public void showValidity(boolean show) {
-        mShowValidity = show;
-        notifyDataSetChanged();
-
-        saveDetailState(R.string.sharedpreference_card_details_show_validity, show);
-    }
-
-    public boolean showingValidity() {
-        return mShowValidity;
-    }
-
-    public void showSelectDetailDisplayDialog() {
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(mContext);
-        builder.setTitle(R.string.action_show_details);
-        builder.setMultiChoiceItems(
-                new String[]{
-                        mContext.getString(R.string.show_name_below_image_thumbnail),
-                        mContext.getString(R.string.show_note),
-                        mContext.getString(R.string.show_balance),
-                        mContext.getString(R.string.show_validity)
-                },
-                new boolean[]{
-                        showingNameBelowThumbnail(),
-                        showingNote(),
-                        showingBalance(),
-                        showingValidity()
-                },
-                (dialogInterface, i, b) -> {
-                    switch (i) {
-                        case 0: showNameBelowThumbnail(b); break;
-                        case 1: showNote(b); break;
-                        case 2: showBalance(b); break;
-                        case 3: showValidity(b); break;
-                        default: throw new IndexOutOfBoundsException("No such index exists in LoyaltyCardCursorAdapter show details view");
-                    }
-                }
-        );
-        builder.setPositiveButton(R.string.ok, (dialog, i) -> dialog.dismiss());
-
-        AlertDialog dialog = builder.create();
-        dialog.show();
+    public boolean showingDetails() {
+        return mShowDetails;
    }

    @NonNull
@@ -179,41 +106,42 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
        inputHolder.mDivider.setVisibility(View.GONE);

        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
-        Bitmap icon = Utils.retrieveCardImage(mContext, loyaltyCard.id, ImageLocationType.icon);

-        if (mShowNameBelowThumbnail && icon != null) {
-            inputHolder.setStoreField(loyaltyCard.store);
-        } else {
-            inputHolder.setStoreField(null);
-        }
-
-        if (mShowNote && !loyaltyCard.note.isEmpty()) {
+        inputHolder.setStoreField(loyaltyCard.store);
+        if (mShowDetails && !loyaltyCard.note.isEmpty()) {
            inputHolder.setNoteField(loyaltyCard.note);
        } else {
            inputHolder.setNoteField(null);
        }

-        if (mShowBalance && !loyaltyCard.balance.equals(new BigDecimal("0"))) {
+        if (mShowDetails && !loyaltyCard.balance.equals(new BigDecimal("0"))) {
            inputHolder.setExtraField(inputHolder.mBalanceField, Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType), null);
        } else {
            inputHolder.setExtraField(inputHolder.mBalanceField, null, null);
        }

-        if (mShowValidity && loyaltyCard.validFrom != 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 (mShowValidity && loyaltyCard.expiry != 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);
        }

-        inputHolder.mCardIcon.setContentDescription(loyaltyCard.store);
-        Utils.setIconOrTextWithBackground(mContext, loyaltyCard, icon, inputHolder.mCardIcon, inputHolder.mCardText);
-        inputHolder.setIconBackgroundColor(Utils.getHeaderColor(mContext, loyaltyCard));
+        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 : androidx.appcompat.R.attr.colorPrimary);

        inputHolder.toggleCardStateIcon(loyaltyCard.starStatus != 0, loyaltyCard.archiveStatus != 0, itemSelected(inputCursor.getPosition()));

@@ -225,6 +153,19 @@ 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));

@@ -300,14 +241,16 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso

    public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {

-        public TextView mCardText, mStoreField, mNoteField, mBalanceField, mValidFromField, mExpiryField;
+        public TextView mStoreField, mNoteField, mBalanceField, mValidFromField, mExpiryField;
        public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon, mArchivedBackground;
-        public MaterialCardView mRow;
+        public MaterialCardView mRow, mIconLayout;
        public ConstraintLayout mStar, mArchived;
        public View mDivider;

        private int mIconBackgroundColor;

+
+
        protected LoyaltyCardListItemViewHolder(LoyaltyCardLayoutBinding loyaltyCardLayoutBinding, CardAdapterListener inputListener) {
            super(loyaltyCardLayoutBinding.getRoot());
            View inputView = loyaltyCardLayoutBinding.getRoot();
@@ -318,8 +261,8 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            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;
@@ -342,15 +285,20 @@ 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, 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) {
@@ -364,12 +312,8 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
        }

        public void setStoreField(String text) {
-            if (text == null) {
-                mStoreField.setVisibility(View.GONE);
-            } else {
-                mStoreField.setVisibility(View.VISIBLE);
-                mStoreField.setText(text);
-            }
+            mStoreField.setText(text);
+            mStoreField.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
            mStoreField.requestLayout();
        }

@@ -379,6 +323,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            } else {
                mNoteField.setVisibility(View.VISIBLE);
                mNoteField.setText(text);
+                mNoteField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
            }
            mNoteField.requestLayout();
        }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -23,7 +23,6 @@ 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,7 +30,6 @@ 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;
@@ -85,7 +83,7 @@ import protect.card_locker.async.TaskHandler;
 import protect.card_locker.databinding.LayoutChipChoiceBinding;
 import protect.card_locker.databinding.LoyaltyCardEditActivityBinding;

-public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements BarcodeImageWriterResultCallback {
+public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    private LoyaltyCardEditActivityBinding binding;
    private static final String TAG = "Catima";

@@ -100,7 +98,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
    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";
@@ -121,7 +118,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
    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";
@@ -156,7 +152,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
    int loyaltyCardId;
    boolean updateLoyaltyCard;
    boolean duplicateFromLoyaltyCardId;
-    boolean openSetIconMenu;
    String cardId;
    String barcodeId;
    String barcodeType;
@@ -174,8 +169,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
    AlertDialog confirmExitDialog = null;

    boolean validBalance = true;
+    Runnable barcodeImageGenerationFinishedCallback;
+
    HashMap<String, Currency> currencies = new HashMap<>();
-    HashMap<String, String> currencySymbols = new HashMap<>();

    LoyaltyCard tempLoyaltyCard;

@@ -244,8 +240,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        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;
@@ -292,7 +286,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        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
@@ -310,7 +303,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        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
@@ -330,7 +322,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements

        for (Currency currency : Currency.getAvailableCurrencies()) {
            currencies.put(currency.getSymbol(), currency);
-            currencySymbols.put(currency.getCurrencyCode(), currency.getSymbol());
        }

        tabs = binding.tabs;
@@ -357,6 +348,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements

        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) {
@@ -495,20 +493,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                    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.topMargin = contentPadding / 2;
-                    params.rightMargin = contentPadding;
-
-                    input.setLayoutParams(params);
-                    container.addView(input);
                    if (tempLoyaltyCard.barcodeId != null) {
                        input.setText(tempLoyaltyCard.barcodeId);
                    }
-                    builder.setView(container);
+                    builder.setView(input);

                    builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
                        // If the user manually changes the barcode again make sure we disable the
@@ -855,9 +843,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
            }
        }

+        // Generate random header color
        if (tempLoyaltyCard.headerColor == null) {
-            // If name is set, pick colour relevant for name. Otherwise pick randomly
-            updateTempState(LoyaltyCardField.headerColor, tempLoyaltyCard.store.isEmpty() ? Utils.getRandomHeaderColor(this) : Utils.getHeaderColor(this, tempLoyaltyCard));
+            // Select a random color to start out with.
+            updateTempState(LoyaltyCardField.headerColor, Utils.getRandomHeaderColor(this));
        }

        // Update from intent
@@ -917,19 +906,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        }

        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, Utils.getHeaderColor(this, tempLoyaltyCard));
+            int headerColor = Utils.getHeaderColorFromImage((Bitmap) icon, tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : androidx.appcompat.R.attr.colorPrimary);

            updateTempState(LoyaltyCardField.headerColor, headerColor);

@@ -1013,7 +995,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        if (balanceType == null) {
            balanceCurrencyField.setText(getString(R.string.points));
        } else {
-            balanceCurrencyField.setText(getCurrencySymbol(balanceType));
+            balanceCurrencyField.setText(balanceType.getSymbol());
        }
    }

@@ -1147,12 +1129,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        Uri photoURI = FileProvider.getUriForFile(LoyaltyCardEditActivity.this, BuildConfig.APPLICATION_ID, Utils.createTempFile(this, TEMP_CAMERA_IMAGE_NAME));
        mRequestedImage = type;

-        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);
-        }
+        mPhotoTakerLauncher.launch(photoURI);
    }

    private void selectImageFromGallery(int type) {
@@ -1173,14 +1150,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        }
    }

-    @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 {
        @Override
        public void onClick(View v) {
@@ -1578,13 +1547,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                            barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);

                            Log.d(TAG, "ImageView size now known");
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, LoyaltyCardEditActivity.this, true);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback, 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, this, true);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback, true);
            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
        }
    }
@@ -1641,16 +1610,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements

    private void currencyPrioritizeLocaleSymbols(ArrayList<String> currencyList, Locale locale) {
        try {
-            String currencySymbol = getCurrencySymbol(Currency.getInstance(locale));
+            String currencySymbol = Currency.getInstance(locale).getSymbol();
            currencyList.remove(currencySymbol);
            currencyList.add(0, currencySymbol);
        } catch (IllegalArgumentException e) {
            Log.d(TAG, "Could not get currency data for locale info: " + e);
        }
    }
-
-    private String getCurrencySymbol(final Currency currency) {
-        // Workaround for Android bug where the output of Currency.getSymbol() changes.
-        return currencySymbols.get(currency.getCurrencyCode());
-    }
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -15,15 +15,18 @@ import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
+import android.view.GestureDetector;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.Toast;

 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.SearchView;
@@ -47,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 {
+public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener, GestureDetector.OnGestureListener {
    private MainActivityBinding binding;
    private ArchiveActivityBinding archiveActivityBinding;
    private ContentMainBinding contentMainBinding;
@@ -60,6 +63,7 @@ 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;
@@ -278,11 +282,19 @@ 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);
@@ -432,7 +444,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    }

    private void displayCardSetupOptions(Menu menu, boolean shouldShow) {
-        for (int id : new int[]{R.id.action_search, R.id.action_shown_details, R.id.action_sort}) {
+        for (int id : new int[]{R.id.action_search, R.id.action_unfold, R.id.action_sort}) {
            menu.findItem(id).setVisible(shouldShow);
        }
    }
@@ -597,6 +609,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            getMenuInflater().inflate(R.menu.archive_menu, inputMenu);
        }

+        Utils.updateMenuCardDetailsButtonState(inputMenu.findItem(R.id.action_unfold), mAdapter.showingDetails());
        displayCardSetupOptions(inputMenu, mLoyaltyCardCount > 0);

        SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
@@ -649,8 +662,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            onBackPressed();
        }

-        if (id == R.id.action_shown_details) {
-            mAdapter.showSelectDetailDisplayDialog();
+        if (id == R.id.action_unfold) {
+            mAdapter.showDetails(!mAdapter.showingDetails());
            invalidateOptionsMenu();

            return true;
@@ -755,6 +768,83 @@ 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);
--- a/app/src/main/java/protect/card_locker/ManageGroupActivity.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupActivity.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.Map;

 import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.RecyclerView;
@@ -159,7 +160,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
    @Override
    public boolean onCreateOptionsMenu(Menu inputMenu) {
        getMenuInflater().inflate(R.menu.card_details_menu, inputMenu);
-
+        Utils.updateMenuCardDetailsButtonState(inputMenu.findItem(R.id.action_unfold), mAdapter.showingDetails());
        return super.onCreateOptionsMenu(inputMenu);
    }

@@ -167,8 +168,8 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
    public boolean onOptionsItemSelected(MenuItem inputItem) {
        int id = inputItem.getItemId();

-        if (id == R.id.action_shown_details) {
-            mAdapter.showSelectDetailDisplayDialog();
+        if (id == R.id.action_unfold) {
+            mAdapter.showDetails(!mAdapter.showingDetails());
            invalidateOptionsMenu();

            return true;
--- a/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
@@ -150,10 +150,8 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
                ViewGroup.LayoutParams.MATCH_PARENT,
                ViewGroup.LayoutParams.WRAP_CONTENT
        );
-        int contentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
-        params.leftMargin = contentPadding;
-        params.topMargin = contentPadding / 2;
-        params.rightMargin = contentPadding;
+        params.leftMargin = 50;
+        params.rightMargin = 50;
        input.setLayoutParams(params);
        container.addView(input);

--- a/app/src/main/java/protect/card_locker/ShortcutHelper.java
+++ b/app/src/main/java/protect/card_locker/ShortcutHelper.java
@@ -33,6 +33,7 @@ class ShortcutHelper {
    private static final int ADAPTIVE_BITMAP_SIZE = 108 * ADAPTIVE_BITMAP_SCALE;
    private static final int ADAPTIVE_BITMAP_VISIBLE_SIZE = 72 * ADAPTIVE_BITMAP_SCALE;
    private static final int ADAPTIVE_BITMAP_IMAGE_SIZE = ADAPTIVE_BITMAP_VISIBLE_SIZE + 5 * ADAPTIVE_BITMAP_SCALE;
+    private static final int PADDING_COLOR = Color.argb(255, 255, 255, 255);
    private static final int PADDING_COLOR_OVERLAY = Color.argb(127, 0, 0, 0);

    /**
@@ -144,7 +145,7 @@ class ShortcutHelper {
        if (iconBitmap == null) {
            iconBitmap = Utils.generateIcon(context, loyaltyCard, true).getLetterTile();
        } else {
-            iconBitmap = createAdaptiveBitmap(iconBitmap, Utils.getHeaderColor(context, loyaltyCard));
+            iconBitmap = createAdaptiveBitmap(iconBitmap, loyaltyCard.headerColor == null ? PADDING_COLOR : loyaltyCard.headerColor);
        }

        IconCompat icon = IconCompat.createWithAdaptiveBitmap(iconBitmap);
--- a/app/src/main/java/protect/card_locker/Utils.java
+++ b/app/src/main/java/protect/card_locker/Utils.java
@@ -18,9 +18,6 @@ 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;
@@ -560,6 +557,16 @@ public class Utils {
        activity.findViewById(android.R.id.content).setBackgroundColor(typedValue.data);
    }

+    public static void updateMenuCardDetailsButtonState(MenuItem item, boolean currentlyExpanded) {
+        if (currentlyExpanded) {
+            item.setIcon(R.drawable.ic_baseline_unfold_less_24);
+            item.setTitle(R.string.action_hide_details);
+        } else {
+            item.setIcon(R.drawable.ic_baseline_unfold_more_24);
+            item.setTitle(R.string.action_show_details);
+        }
+    }
+
    public static int getHeaderColorFromImage(Bitmap image, int fallback) {
        if (image == null) {
            return fallback;
@@ -592,42 +599,4 @@ public class Utils {

        return result.toString();
    }
-
-    public static void setIconOrTextWithBackground(Context context, LoyaltyCard loyaltyCard, Bitmap icon, ImageView backgroundOrIcon, TextView textWhenNoImage) {
-        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 = getHeaderColor(context, loyaltyCard);
-
-            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;
-        }
-    }
-
-    public static int getHeaderColor(Context context, LoyaltyCard loyaltyCard) {
-        return loyaltyCard.headerColor != null ? loyaltyCard.headerColor : LetterBitmap.getDefaultColor(context, loyaltyCard.store);
-    }
 }
--- a/app/src/main/java/protect/card_locker/contentprovider/CardsContentProvider.java
+++ b/app/src/main/java/protect/card_locker/contentprovider/CardsContentProvider.java
@@ -1,172 +0,0 @@
-package protect.card_locker.contentprovider;
-
-import static protect.card_locker.DBHelper.LoyaltyCardDbIds;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
-import android.os.Build;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import protect.card_locker.BuildConfig;
-import protect.card_locker.DBHelper;
-import protect.card_locker.preferences.Settings;
-
-public class CardsContentProvider extends ContentProvider {
-    private static final String TAG = "Catima";
-
-    public static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".contentprovider.cards";
-
-    public static class Version {
-        public static final String MAJOR_COLUMN = "major";
-        public static final String MINOR_COLUMN = "minor";
-        public static final int MAJOR = 1;
-        public static final int MINOR = 0;
-    }
-
-    private static final int URI_VERSION = 0;
-    private static final int URI_CARDS = 1;
-    private static final int URI_GROUPS = 2;
-    private static final int URI_CARD_GROUPS = 3;
-
-    private static final String[] CARDS_DEFAULT_PROJECTION = new String[]{
-            LoyaltyCardDbIds.ID,
-            LoyaltyCardDbIds.STORE,
-            LoyaltyCardDbIds.VALID_FROM,
-            LoyaltyCardDbIds.EXPIRY,
-            LoyaltyCardDbIds.BALANCE,
-            LoyaltyCardDbIds.BALANCE_TYPE,
-            LoyaltyCardDbIds.NOTE,
-            LoyaltyCardDbIds.HEADER_COLOR,
-            LoyaltyCardDbIds.CARD_ID,
-            LoyaltyCardDbIds.BARCODE_ID,
-            LoyaltyCardDbIds.BARCODE_TYPE,
-            LoyaltyCardDbIds.STAR_STATUS,
-            LoyaltyCardDbIds.LAST_USED,
-            LoyaltyCardDbIds.ARCHIVE_STATUS,
-    };
-
-    private static final UriMatcher uriMatcher = new UriMatcher(UriMatcher.NO_MATCH) {{
-        addURI(AUTHORITY, "version", URI_VERSION);
-        addURI(AUTHORITY, "cards", URI_CARDS);
-        addURI(AUTHORITY, "groups", URI_GROUPS);
-        addURI(AUTHORITY, "card_groups", URI_CARD_GROUPS);
-    }};
-
-    @Override
-    public boolean onCreate() {
-        return true;
-    }
-
-    @Nullable
-    @Override
-    public Cursor query(@NonNull final Uri uri,
-                        @Nullable final String[] projection,
-                        @Nullable final String selection,
-                        @Nullable final String[] selectionArgs,
-                        @Nullable final String sortOrder) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            // Disable the content provider on SDK < 23 since it grants dangerous
-            // permissions at install-time
-            Log.w(TAG, "Content provider read is only available for SDK >= 23");
-            return null;
-        }
-
-        final Settings settings = new Settings(getContext());
-        if (!settings.getAllowContentProviderRead()) {
-            Log.w(TAG, "Content provider read is disabled");
-            return null;
-        }
-
-        final String table;
-        String[] updatedProjection = projection;
-
-        switch (uriMatcher.match(uri)) {
-            case URI_VERSION:
-                return queryVersion();
-            case URI_CARDS:
-                table = DBHelper.LoyaltyCardDbIds.TABLE;
-                // Restrict columns to the default projection (omit internal columns such as zoom level)
-                if (projection == null) {
-                    updatedProjection = CARDS_DEFAULT_PROJECTION;
-                } else {
-                    final Set<String> defaultProjection = new HashSet<>(Arrays.asList(CARDS_DEFAULT_PROJECTION));
-                    updatedProjection = Arrays.stream(projection).filter(defaultProjection::contains).toArray(String[]::new);
-                }
-                break;
-            case URI_GROUPS:
-                table = DBHelper.LoyaltyCardDbGroups.TABLE;
-                break;
-            case URI_CARD_GROUPS:
-                table = DBHelper.LoyaltyCardDbIdsGroups.TABLE;
-                break;
-            default:
-                Log.w(TAG, "Unrecognized URI " + uri);
-                return null;
-        }
-
-        final DBHelper dbHelper = new DBHelper(getContext());
-        final SQLiteDatabase database = dbHelper.getReadableDatabase();
-
-        return database.query(
-                table,
-                updatedProjection,
-                selection,
-                selectionArgs,
-                null,
-                null,
-                sortOrder
-        );
-    }
-
-    private Cursor queryVersion() {
-        final String[] columns = new String[]{Version.MAJOR_COLUMN, Version.MINOR_COLUMN};
-        final MatrixCursor matrixCursor = new MatrixCursor(columns);
-        matrixCursor.addRow(new Object[]{Version.MAJOR, Version.MINOR});
-
-        return matrixCursor;
-    }
-
-    @Nullable
-    @Override
-    public String getType(@NonNull final Uri uri) {
-        // MIME types are not relevant (for now at least)
-        return null;
-    }
-
-    @Nullable
-    @Override
-    public Uri insert(@NonNull final Uri uri,
-                      @Nullable final ContentValues values) {
-        // This content provider is read-only for now, so we always return null
-        return null;
-    }
-
-    @Override
-    public int delete(@NonNull final Uri uri,
-                      @Nullable final String selection,
-                      @Nullable final String[] selectionArgs) {
-        // This content provider is read-only for now, so we always return 0
-        return 0;
-    }
-
-    @Override
-    public int update(@NonNull final Uri uri,
-                      @Nullable final ContentValues values,
-                      @Nullable final String selection,
-                      @Nullable final String[] selectionArgs) {
-        // This content provider is read-only for now, so we always return 0
-        return 0;
-    }
-}
--- a/app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
@@ -17,6 +17,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringReader;
+import java.io.UncheckedIOException;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -100,7 +101,7 @@ public class CatimaImporter implements Importer {
            }

            parser.close();
-        } catch (IllegalArgumentException | IllegalStateException e) {
+        } catch (UncheckedIOException e) {
            throw new FormatException("Issue parsing CSV data", e);
        }
    }
@@ -182,7 +183,7 @@ public class CatimaImporter implements Importer {
                    throw new InterruptedException();
                }
            }
-        } catch (IllegalArgumentException | IllegalStateException e) {
+        } catch (UncheckedIOException e) {
            throw new FormatException("Issue parsing CSV data", e);
        } finally {
            groupParser.close();
@@ -207,7 +208,7 @@ public class CatimaImporter implements Importer {
                    throw new InterruptedException();
                }
            }
-        } catch (IllegalArgumentException | IllegalStateException e) {
+        } catch (UncheckedIOException e) {
            throw new FormatException("Issue parsing CSV data", e);
        } finally {
            cardParser.close();
@@ -232,7 +233,7 @@ public class CatimaImporter implements Importer {
                    throw new InterruptedException();
                }
            }
-        } catch (IllegalArgumentException | IllegalStateException e) {
+        } catch (UncheckedIOException e) {
            throw new FormatException("Issue parsing CSV data", e);
        } finally {
            cardGroupParser.close();
--- a/app/src/main/java/protect/card_locker/preferences/Settings.java
+++ b/app/src/main/java/protect/card_locker/preferences/Settings.java
@@ -63,6 +63,30 @@ 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);
    }
@@ -79,10 +103,6 @@ public class Settings {
        return getBoolean(R.string.settings_key_disable_lockscreen_while_viewing_card, true);
    }

-    public boolean getAllowContentProviderRead() {
-        return getBoolean(R.string.settings_key_allow_content_provider_read, true);
-    }
-
    public boolean getOledDark() {
        return getBoolean(R.string.settings_key_oled_dark, false);
    }
--- a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
+++ b/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
@@ -3,7 +3,6 @@ package protect.card_locker.preferences;

 import android.app.Activity;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.MenuItem;

@@ -14,12 +13,18 @@ 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;
@@ -98,8 +103,23 @@ public class SettingsActivity extends CatimaAppCompatActivity {
            // Load the preferences from an XML resource
            addPreferencesFromResource(R.xml.preferences);

-            // Show pretty names and summaries
-            ListPreference themePreference = findPreference(getResources().getString(R.string.settings_key_theme));
+            // Show pretty names
+            ListPreference localePreference = findPreference(getResources().getString(R.string.settings_key_locale));
+            assert localePreference != null;
+            CharSequence[] entryValues = localePreference.getEntryValues();
+            List<CharSequence> entries = new ArrayList<>();
+            for (CharSequence entry : entryValues) {
+                if (entry.length() == 0) {
+                    entries.add(getResources().getString(R.string.settings_system_locale));
+                } else {
+                    Locale entryLocale = Utils.stringToLocale(entry.toString());
+                    entries.add(entryLocale.getDisplayName(entryLocale));
+                }
+            }
+
+            localePreference.setEntries(entries.toArray(new CharSequence[entryValues.length]));
+
+            Preference themePreference = findPreference(getResources().getString(R.string.settings_key_theme));
            assert themePreference != null;
            themePreference.setOnPreferenceChangeListener((preference, o) -> {
                if (o.toString().equals(getResources().getString(R.string.settings_key_light_theme))) {
@@ -113,16 +133,10 @@ public class SettingsActivity extends CatimaAppCompatActivity {
                return true;
            });

-            ListPreference themeColorPreference = findPreference(getResources().getString(R.string.setting_key_theme_color));
-            assert themeColorPreference != null;
-            themeColorPreference.setOnPreferenceChangeListener((preference, o) -> {
+            localePreference.setOnPreferenceChangeListener((preference, newValue) -> {
                refreshActivity(true);
                return true;
            });
-            if (!DynamicColors.isDynamicColorAvailable()) {
-                themeColorPreference.setEntryValues(R.array.color_values_no_dynamic);
-                themeColorPreference.setEntries(R.array.color_value_strings_no_dynamic);
-            }

            Preference oledDarkPreference = findPreference(getResources().getString(R.string.settings_key_oled_dark));
            assert oledDarkPreference != null;
@@ -131,29 +145,16 @@ public class SettingsActivity extends CatimaAppCompatActivity {
                return true;
            });

-            ListPreference localePreference = findPreference(getResources().getString(R.string.settings_key_locale));
-            assert localePreference != null;
-            CharSequence[] entryValues = localePreference.getEntryValues();
-            List<CharSequence> entries = new ArrayList<>();
-            for (CharSequence entry : entryValues) {
-                if (entry.length() == 0) {
-                    entries.add(getResources().getString(R.string.settings_system_locale));
-                } else {
-                    Locale entryLocale = Utils.stringToLocale(entry.toString());
-                    entries.add(entryLocale.getDisplayName(entryLocale));
-                }
-            }
-            localePreference.setEntries(entries.toArray(new CharSequence[entryValues.length]));
-            localePreference.setOnPreferenceChangeListener((preference, newValue) -> {
+            ListPreference colorPreference = findPreference(getResources().getString(R.string.setting_key_theme_color));
+            assert colorPreference != null;
+            colorPreference.setOnPreferenceChangeListener((preference, o) -> {
                refreshActivity(true);
                return true;
            });
-
-            // Disable content provider on SDK < 23 since dangerous permissions
-            // are granted at install-time
-            Preference contentProviderReadPreference = findPreference(getResources().getString(R.string.settings_key_allow_content_provider_read));
-            assert contentProviderReadPreference != null;
-            contentProviderReadPreference.setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M);
+            if (!DynamicColors.isDynamicColorAvailable()) {
+                colorPreference.setEntryValues(R.array.color_values_no_dynamic);
+                colorPreference.setEntries(R.array.color_value_strings_no_dynamic);
+            }
        }

        private void refreshActivity(boolean reloadMain) {
@@ -163,5 +164,30 @@ 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);
+            }
+        }
    }
 }
+
--- a/app/src/main/res/drawable/active_dot.xml
+++ b/app/src/main/res/drawable/active_dot.xml
@@ -0,0 +1,9 @@
+<?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>
--- a/app/src/main/res/drawable/dialog_bg_monet.xml
+++ b/app/src/main/res/drawable/dialog_bg_monet.xml
@@ -1,24 +0,0 @@
-<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>
--- a/app/src/main/res/drawable/home_arrow_back_white.xml
+++ b/app/src/main/res/drawable/home_arrow_back_white.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+<vector android:autoMirrored="true" 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,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"/>
+    <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"/>
 </vector>
--- a/app/src/main/res/drawable/ic_baseline_chevron_left_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_chevron_left_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+<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="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
--- a/app/src/main/res/drawable/ic_baseline_chevron_right_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_chevron_right_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+<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="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
--- a/app/src/main/res/drawable/ic_baseline_expand_more_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_expand_more_24.xml
@@ -1,10 +0,0 @@
-<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>
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -0,0 +1,10 @@
+<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>
--- a/app/src/main/res/drawable/ic_lock_open_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_lock_open_white_24dp.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="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"/>
+    <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>
--- a/app/src/main/res/drawable/ic_lock_outline_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_lock_outline_white_24dp.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="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+    <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"/>
 </vector>
--- a/app/src/main/res/drawable/ic_share_white.xml
+++ b/app/src/main/res/drawable/ic_share_white.xml
@@ -0,0 +1,5 @@
+<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>
--- a/app/src/main/res/drawable/inactive_dot.xml
+++ b/app/src/main/res/drawable/inactive_dot.xml
@@ -0,0 +1,9 @@
+<?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>
--- a/app/src/main/res/layout/about_activity.xml
+++ b/app/src/main/res/layout/about_activity.xml
@@ -128,10 +128,11 @@

                <TextView
                    android:id="@+id/translate_sub"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:padding="2dp"
                    android:text="@string/translate_platform"
+                    android:layout_marginEnd="20dp"
                    android:textSize="16sp"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toBottomOf="@id/translate_main"/>
@@ -168,10 +169,11 @@

                <TextView
                    android:id="@+id/license_sub"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:padding="2dp"
                    android:text="@string/app_license"
+                    android:layout_marginEnd="20dp"
                    android:textSize="16sp"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toBottomOf="@id/license_main"/>
@@ -269,36 +271,6 @@
                    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"
--- a/app/src/main/res/layout/group_layout.xml
+++ b/app/src/main/res/layout/group_layout.xml
@@ -37,48 +37,36 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content">

-        <Button
+        <ImageButton
            android:id="@+id/moveUp"
-            style="?attr/materialIconButtonFilledStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/cardThumbnailSize"
+            android:layout_height="@dimen/cardThumbnailSize"
            android:layout_weight="1"
-            app:icon="@drawable/ic_baseline_arrow_drop_up_24"
-            app:iconGravity="textStart"
-            app:tint="?attr/colorOnPrimary"
+            app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
            android:contentDescription="@string/moveUp"/>

-        <Button
+        <ImageButton
            android:id="@+id/moveDown"
-            style="?attr/materialIconButtonFilledStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/cardThumbnailSize"
+            android:layout_height="@dimen/cardThumbnailSize"
            android:layout_weight="1"
-            app:icon="@drawable/ic_baseline_arrow_drop_down_24"
-            app:iconGravity="textStart"
-            app:tint="?attr/colorOnPrimary"
+            app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
            android:contentDescription="@string/moveDown"/>

-        <Button
+        <ImageButton
            android:id="@+id/edit"
-            style="?attr/materialIconButtonFilledStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/cardThumbnailSize"
+            android:layout_height="@dimen/cardThumbnailSize"
            android:layout_weight="1"
-            app:icon="@drawable/ic_mode_edit_white_24dp"
-            app:iconGravity="textStart"
-            app:tint="?attr/colorOnPrimary"
+            app:srcCompat="@drawable/ic_mode_edit_white_24dp"
            android:contentDescription="@string/edit"/>

-        <Button
+        <ImageButton
            android:id="@+id/delete"
-            style="?attr/materialIconButtonFilledStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/cardThumbnailSize"
+            android:layout_height="@dimen/cardThumbnailSize"
            android:layout_weight="1"
-            app:icon="@drawable/ic_delete_white_24dp"
-            app:iconGravity="textStart"
-            app:tint="?attr/colorOnPrimary"
+            app:srcCompat="@drawable/ic_delete_white_24dp"
            android:contentDescription="@string/delete"/>

    </LinearLayout>
--- a/app/src/main/res/layout/loyalty_card_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_layout.xml
@@ -9,7 +9,8 @@

    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp">

        <com.google.android.material.card.MaterialCardView
            android:id="@+id/icon_layout"
@@ -23,6 +24,7 @@
            app:layout_constraintTop_toTopOf="parent">

            <ImageView
+                android:importantForAccessibility="no"
                android:id="@+id/thumbnail"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
@@ -34,20 +36,6 @@
                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"
@@ -136,10 +124,7 @@
            android:layout_marginStart="8dp"
            android:layout_marginEnd="8dp"
            android:layout_marginBottom="4dp"
-            android:textAppearance="?attr/textAppearanceHeadlineSmall"
-            android:textColor="?android:attr/textColorSecondary"
-            android:visibility="gone"
-            tools:visibility="visible"
+            android:textAppearance="?attr/textAppearanceHeadline1"
            app:layout_constraintTop_toBottomOf="@+id/icon_layout"
            app:layout_constraintBottom_toTopOf="@+id/note"
            app:layout_constraintEnd_toEndOf="parent"
@@ -182,7 +167,6 @@
            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"
@@ -202,7 +186,6 @@
            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"
@@ -222,7 +205,6 @@
            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"
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -6,200 +6,215 @@
    android:id="@+id/coordinator_layout"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
-    android:fitsSystemWindows="false">
+    android:fitsSystemWindows="true">
+

    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        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">

        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            style="?attr/toolbarStyle" />
-    </com.google.android.material.appbar.AppBarLayout>
+            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" />

-    <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"
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/collapsingToolbarLayout"
+            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
-            android:layout_marginBottom="20dp">
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:minHeight="56.0dip"
+            app:contentScrim="?colorPrimary"
+            app:expandedTitleGravity="top"
+            app:expandedTitleMarginEnd="64dp"
+            app:expandedTitleMarginStart="48dp">

-            <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"
-            android:layoutDirection="ltr">
-
-            <!-- 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:id="@+id/main_card_view"
-                    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="25dp"
-            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"
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/storeName"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
-                android:contentDescription="@string/setBarcodeHeight"
-                android:max="100" />
-        </LinearLayout>
+                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" />

-        <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="25dp"
-            android:background="@android:color/transparent"/>
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <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>

    <com.google.android.material.bottomappbar.BottomAppBar
        android:id="@+id/bottom_app_bar"
@@ -214,70 +229,53 @@
        app:contentInsetEnd="0dp"
        app:fabAlignmentMode="center">

-        <LinearLayout
-            android:layout_width="match_parent"
+        <ImageButton
+            android:id="@+id/button_previous"
+            android:layout_width="wrap_content"
            android:layout_height="match_parent"
-            android:layoutDirection="ltr">
+            android:layout_gravity="left"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_baseline_chevron_left_24"
+            android:tooltipText="@string/previousCard"
+            android:visibility="gone" />

-            <ImageButton
-                android:id="@+id/bottom_app_bar_previous_button"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:paddingStart="12dp"
-                android:paddingEnd="12dp"
-                android:background="@android:color/transparent"
-                android:src="@drawable/ic_baseline_chevron_left_24"
-                android:tooltipText="@string/previousCard"
-                android:visibility="gone" />
+        <ImageButton
+            android:id="@+id/button_show_info"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_baseline_info_24"
+            android:tooltipText="@string/showMoreInfo"
+            android:visibility="gone" />

-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal"
-                android:layoutDirection="locale">
+        <ImageButton
+            android:id="@+id/button_next"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="right"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_baseline_chevron_right_24"
+            android:tooltipText="@string/nextCard"
+            android:visibility="gone" />

-                <ImageButton
-                    android:id="@+id/bottom_app_bar_info_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:paddingStart="12dp"
-                    android:paddingEnd="12dp"
-                    android:background="@android:color/transparent"
-                    android:src="@drawable/ic_baseline_info_24"
-                    android:tooltipText="@string/showMoreInfo"
-                    android:visibility="gone" />
-
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1" />
-
-                <ImageButton
-                    android:id="@+id/bottom_app_bar_update_balance_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:paddingStart="12dp"
-                    android:paddingEnd="12dp"
-                    android:background="@android:color/transparent"
-                    android:src="@drawable/ic_baseline_shopping_cart_24"
-                    android:tooltipText="@string/updateBalance"
-                    android:visibility="gone" />
-
-            </LinearLayout>
-
-            <ImageButton
-                android:id="@+id/bottom_app_bar_next_button"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:paddingStart="12dp"
-                android:paddingEnd="12dp"
-                android:background="@android:color/transparent"
-                android:src="@drawable/ic_baseline_chevron_right_24"
-                android:tooltipText="@string/nextCard"
-                android:visibility="gone" />
-
-        </LinearLayout>
+        <ImageButton
+            android:id="@+id/button_update_balance"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="end"
+            android:background="@android:color/transparent"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:src="@drawable/ic_baseline_shopping_cart_24"
+            android:tooltipText="@string/updateBalance"
+            android:visibility="gone" />

    </com.google.android.material.bottomappbar.BottomAppBar>

--- a/app/src/main/res/layout/preference_material_switch.xml
+++ b/app/src/main/res/layout/preference_material_switch.xml
@@ -1,8 +0,0 @@
-<?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" />
--- a/app/src/main/res/layout/sorting_option.xml
+++ b/app/src/main/res/layout/sorting_option.xml
@@ -10,13 +10,12 @@

        <CheckBox
            android:id="@+id/checkBox_reverse"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:paddingStart="20dp"
+            android:layout_marginLeft="20dp"
+            android:paddingLeft="20dp"
            android:text="@string/reverse"
-            android:textSize="16sp"
-            android:textColor="?attr/colorOnSurfaceVariant"/>
+            android:textSize="19sp"/>

    </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/menu/archive_menu.xml
+++ b/app/src/main/res/menu/archive_menu.xml
@@ -10,9 +10,9 @@
        app:showAsAction="always|collapseActionView"
        android:visible="false"/>
    <item
-        android:id="@+id/action_shown_details"
-        android:title="@string/action_show_details"
-        android:icon="@drawable/baseline_visibility_24"
+        android:id="@+id/action_unfold"
+        android:title="@string/action_hide_details"
+        android:icon="@drawable/ic_baseline_unfold_less_24"
        app:showAsAction="always"
        android:visible="false"/>
    <item
--- a/app/src/main/res/menu/card_details_menu.xml
+++ b/app/src/main/res/menu/card_details_menu.xml
@@ -1,9 +1,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:app="http://schemas.android.com/apk/res-auto">
    <item
-        android:id="@+id/action_shown_details"
-        android:title="@string/action_show_details"
-        android:icon="@drawable/baseline_visibility_24"
+        android:id="@+id/action_unfold"
+        android:title="@string/action_hide_details"
+        android:icon="@drawable/ic_baseline_unfold_less_24"
        app:showAsAction="always"
        android:visible="true"/>
 </menu>
--- a/app/src/main/res/menu/card_update_menu.xml
+++ b/app/src/main/res/menu/card_update_menu.xml
@@ -0,0 +1,9 @@
+<?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>
--- a/app/src/main/res/menu/card_view_menu.xml
+++ b/app/src/main/res/menu/card_view_menu.xml
@@ -4,13 +4,13 @@

    <item
        android:id="@+id/action_share"
-        android:icon="@drawable/ic_share"
+        android:icon="@drawable/ic_share_white"
        android:title="@string/share"
        app:showAsAction="always"/>

    <item
        android:id="@+id/action_star_unstar"
-        android:icon="@drawable/ic_unstarred"
+        android:icon="@drawable/ic_unstarred_white"
        android:title="@string/star"
        app:showAsAction="always" />

--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@@ -10,9 +10,9 @@
        app:showAsAction="always|collapseActionView"
        android:visible="false"/>
    <item
-        android:id="@+id/action_shown_details"
-        android:title="@string/action_show_details"
-        android:icon="@drawable/baseline_visibility_24"
+        android:id="@+id/action_unfold"
+        android:title="@string/action_hide_details"
+        android:icon="@drawable/ic_baseline_unfold_less_24"
        app:showAsAction="always"
        android:visible="false"/>
    <item
--- a/app/src/main/res/raw/contributors.txt
+++ b/app/src/main/res/raw/contributors.txt
@@ -7,56 +7,51 @@ Heimen Stoffels
 Oğuz Ersen
 Katharine Chui
 mondstern
-StoyanDimitrov
 IllusiveMan196
-SlavekB
+StoyanDimitrov
 Altonss
+SlavekB
 Michael Moroni
 Gediminas Murauskas
 Petr Novák
 Joel A
-laralem
 Taco
+laralem
 pfaffenrodt
-FC Stegerman
-gallegonovato
 Nyatsuki
+gallegonovato
 HudobniVolk
 Samantaz Fox
 arno-github
 Ankit Tiwari
 Sergio Paredes
-Clxff H3r4ld0
 Aayush Gupta
 huuhaa
 Quentin PAGÈS
-Eric
-Balázs Meskó
-Projjal Moitra
 Alexander Ivanov
 arshbeerSingh
 Denis Shilin
 Freddo espresso
-Giovanni Donisi
 Silvério Santos
 Miha Frangež
-Eryk Michalak
 Arnis Jaundžeikars
-Dan
+Kefir2105
 sr093906
+Giovanni Donisi
 mdvhimself
 Katarzyna
 echo r"0xX4H" | rev
 Magnitudee
 Olivia (Zoe)
+Projjal Moitra
 betsythefc
 waffshappen
 Robin
+Eric
 ati3
-enolp
+(Cliff Heraldo)
 Evgeniy Khramov
 Jane Kong
-Jean Mareilles
 Jiri Grönroos
 K. Herbert
 Lisa A.
@@ -66,9 +61,8 @@ Still Hsu
 String E. Fighter
 Tapu
 Yurical
+Eryk Michalak
 rr-vesp
-yangyangdaji
-丛林意志
 alajemba-vik
 /usr/local/ΕΨΗΕΛΩΝ
 Adolfo Jayme-Barrientos
@@ -77,31 +71,23 @@ KovalevArtem
 Artem M.
 Astrohops1
 BMN
-balaraz
 BootVirtual
 Clonewayx
 D. Domig
 Diego
-Eudes-alencar
 Fede Pujol
-FineFindus
 francescbassas
-Jason Li
 Jean-Luc Tibaux
 Jesse Davids
-José Rebelo
-Kis Dominik
 Lukas Grassauer
-Luna Jernberg
+bittin
 Marnick L'Eau
 Michalis
 Michał
-Milo Ivir
 Mohamed A. Salah
 the7thNightmare
 Rishi Agarwal
 Rosdyana Kusuma
-Sabri Ünal
 umoenks
 Simon Rusinov
 Siriusmart
@@ -111,23 +97,16 @@ Thomas Bertels
 Thomas Cruveilher
 Tian Jiale
 Tong Liu
-Tymofii Lytvynenko
 Wanath
 Runner
 ce i moa
-enescan201
-Frablock
 inesre
 lgasp
-notlin4
 phlostically
-pokeghost
 sal0max
 Ágata Leuck
 BmBKun
-NamHyeonjeong
 Aditya Das
-asier123123131
 Kevin Sicong Jiang
 Tomer Ben-Rachel
 Tom Sawyer
@@ -137,66 +116,54 @@ Airat
 Alexander
 sNiXx
 Angela Enogieru
-Animesh Chatterjee
-Artūras Kalenda
+AnimeshChatterjee1
 Ashish Yadav
+Asier
 Aya Elsaadany
 Biren
 Booc Sylvan
 Brage Nesteby Reitan
-Cap Amr Karam
-Carlo Maria Cuoghi Barbagli
 CherryMonster222
 Colgrave
 Csaba
 Mylou53
 danieluhrinyi
-Daniele Tricoli
 Kasina Dheeraj
 Donno
 Flav
 Franciszek Stefan
-Gael Caraballo
-Giacomo Alessandroni
 Grzegorz
 gneiss15
 Hamustra Scans
-helzubair
 HowITsDone
-Hubert Maciejewicz
 Izzy
 Jacek
 Jacopo Gennaro Esposito
+Jasielprogramador
+Jean Mareilles
 Jean-Baptiste
 Kung-chih
 Karvjorm
-polar
 krkk
 Laura Ferraz 
 Lucas da Costa
-almir992
 Manan Jhaveri
 Marco
 BRBsoup
-Mateo Gomez
 Mattia
 Md. Al-Amin
 Michael Gangolf
 3DN1M
-Minecraft boom
 Mobashir Raihan
 Moi Toi
-OPADILOP
 DivideEtImpera
 Nicolas
 Nosnahc
 pa4k
 pbeckmann
 Peer Beckmann
-vandman
 Piotr Strebski
 Piotr Zet
-Poorva Patidar
 Quang Nguyen
 Ratnesh
 Reza
@@ -207,31 +174,23 @@ SKULD
 Salem Malus
 Samarth Asthan
 Shailendra Maurya
-SilverFS
 Simone Dotto
 Subhashish Anand
-Subhradeep Bera
-Swayam Khare
 SziaTomi
 Mehedi Hasan
 Titas Pažereckas
 atakujonc
-tkraljevic
 Tony C
+Tymofii Lytvynenko
 Vancha March
-tyap-lyap-ivprod
-Waldemar Stoczkowski
 Yevgeny M
 Yusril A
-Ziad OUALHADJ
 ahmed-awad26
 Avik Kundu
-ayuyydev
 diksha-2911
 gbonaspetti
 gittyboy-cell
 huang ivan
-liva
 lucafont2
 mtrmirez
 opsik
@@ -242,12 +201,11 @@ sergio
 080502
 Marcus
 techwebpd
-tjw123hh
 Truestorybaby 
 tygyh
 unstartdev
 wmilan 17
 يوسف لطفي
-元气
+luoyang3
 JaeBeom An
 JungHee Lee
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -48,6 +48,7 @@
    <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>
@@ -55,12 +56,14 @@
    <string name="thumbnailDescription">صورة مصغرة</string>
    <string name="starImage">نجم مفضل</string>
    <string name="settings">اعدادات</string>
+    <string name="settings_category_title_ui">واجهة المستخدم</string>
    <string name="settings_light_theme">فاتح</string>
    <string name="settings_dark_theme">داكن</string>
    <string name="settings_card_orientation">اتجاه الباركود</string>
    <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>
@@ -133,6 +136,9 @@
    <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>
@@ -144,6 +150,7 @@
    <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>
@@ -205,6 +212,7 @@
    <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>
@@ -226,6 +234,7 @@
    <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>
@@ -283,9 +292,4 @@
    <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>
+</resources>
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -1,56 +0,0 @@
-<?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>
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -12,8 +12,8 @@
    <string name="star">Добавя към любими</string>
    <string name="noBarcode">Липсва щрихкод</string>
    <string name="barcodeNoBarcode">Липсва щрихкод</string>
-    <string name="barcodeType">Вид на щрихкода</string>
-    <string name="cardId">Номер на карта</string>
+    <string name="barcodeType">Вид на щрихкод</string>
+    <string name="cardId">Идентификатор на карта</string>
    <string name="note">Бележка</string>
    <string name="storeName">Наименование</string>
    <string name="noMatchingGiftCards">Няма резултати. Променете критериите за търсене.</string>
@@ -35,19 +35,19 @@
    <string name="photos">Снимки</string>
    <string name="importOptionApplicationExplanation">Изберете файл на друго приложение.</string>
    <string name="noCardExistsError">Картата не е намерена</string>
-    <string name="updateBarcodeQuestionText">Номерът е променен. Желаете ли същата стойност да бъде приложена и към щрихкода\?</string>
+    <string name="updateBarcodeQuestionText">Идентификаторът е променен. Желаете ли с неговата стойност да бъде променен и щрихкодът\?</string>
    <string name="updateBarcodeQuestionTitle">Обновяване на щрихкода\?</string>
-    <string name="noCardIdError">Не е въведен номер</string>
+    <string name="noCardIdError">Не е въведен идентификатор</string>
    <string name="noCardsMessage">Добавете карта</string>
    <string name="cardShortcut">Пряк път до карта</string>
    <string name="addCardTitle">Добавяне на карта</string>
    <string name="removeImage">Премахване на изображение</string>
    <string name="takePhoto">Снимане</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">Искам да споделя тези карти с вас</string>
-    <string name="wrongValueForBarcodeType">Неприемлива стойност за избрания вид щрихкод</string>
+    <string name="wrongValueForBarcodeType">Стойността е невалидна за избрания вид щрихкод</string>
    <string name="setBarcodeId">Задаване на стойност</string>
-    <string name="sameAsCardId">Като номера</string>
+    <string name="sameAsCardId">Същата като идентификатора</string>
    <string name="barcodeId">Стойност на щрихкода</string>
    <string name="importLoyaltyCardKeychain">Внасяне от Loyalty Card Keychain</string>
    <string name="importFidmeMessage">Изберете файла <i>fidme-export-request-xxxxxx.zip</i>, предварително изнесен от FidMe и ръчно изберете вида на щрихкодовете.
@@ -63,19 +63,21 @@
    <string name="turn_flashlight_off">Изключва светкавицата</string>
    <string name="turn_flashlight_on">Включва светкавицата</string>
    <string name="passwordRequired">Въведете паролата</string>
-    <string name="points">точки</string>
+    <string name="points">Точки</string>
    <string name="currency">Валута</string>
    <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="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>
@@ -83,18 +85,20 @@
    <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_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_dark_theme">Тъмна</string>
    <string name="settings_light_theme">Светла</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="starImage">Звезда за любимо</string>
    <string name="thumbnailDescription">Миниатюра</string>
-    <string name="copy_to_clipboard_toast">Номерът е копиран в междинната памет</string>
-    <string name="enterBarcodeInstructions">Въведете номер и после или изберете вида на щрихкода, или докоснете бутона „Липсва щрихкод“.</string>
+    <string name="copy_to_clipboard_toast">Идентификаторът е копиран в междинната памет</string>
+    <string name="enterBarcodeInstructions">Въведете идентификатор и или изберете вида на щрихкода, или докоснете бутона „Липсва щрихкод“.</string>
    <string name="selectBarcodeTitle">Избиране на щрихкод</string>
    <string name="importOptionApplicationButton">Избиране чрез приложение</string>
    <string name="importing">Внасяне…</string>
@@ -112,7 +116,7 @@
    <string name="scanCardBarcode">Снемане на щрихкод</string>
    <string name="editCardTitle">Редактиране на карта</string>
    <string name="share">Споделя</string>
-    <string name="copy_to_clipboard">Копира номера в междинната памет</string>
+    <string name="copy_to_clipboard">Копира идентификатора в междинната памет</string>
    <string name="ok">Добре</string>
    <string name="importSuccessful">Данните са внесени</string>
    <string name="chooseImportType">Внасяне на данни на</string>
@@ -123,6 +127,7 @@
    <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>
@@ -178,8 +183,10 @@
    <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>
@@ -195,34 +202,36 @@
    <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>
    <string name="selectColor">Избиране на цвят</string>
    <string name="group_name_is_empty">Името на списъка не може да е празно</string>
    <string name="group_edit">Редактиране на списък</string>
-    <string name="action_show_details">Подробности под картата</string>
+    <string name="action_show_details">Повече детайли</string>
    <string name="action_hide_details">По-малко детайли</string>
    <string name="noGiftCardsGroup">Създайте карти и ги зачислите към списък от тук.</string>
    <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>
+    <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>
@@ -255,32 +264,8 @@
    <string name="importCards">Внасяне на карти</string>
    <string name="storageReadPermissionRequired">За това действие е необходимо разрешение за четене на хранилището…</string>
    <string name="cameraPermissionRequired">За това действие е необходимо разрешение за достъп до камерата…</string>
-    <string name="validFromDate">Валидност от</string>
+    <string name="validFromDate">Валидна от</string>
    <string name="anyDate">Без значение от датата</string>
-    <string name="validFromSentence">Валидност от: <xliff:g>%s</xliff:g></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>
-    <string name="show_note">Бележка</string>
-    <string name="show_balance">Баланс</string>
-    <string name="show_validity">Валидност</string>
-    <string name="show_name_below_image_thumbnail">Наименование</string>
-    <string name="permissionReadCardsLabel">Четене на карти на Catima</string>
-    <string name="permissionReadCardsDescription">Четене на картите с всички подробности, включително бележки и изображения</string>
-    <string name="settings_allow_content_provider_read_title">Разрешаване на достъп на други приложения до данните</string>
-    <string name="settings_display_barcode_max_brightness_summary">Необходимо за работата на някои скенери</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">Без заключване на екрана при преглед на карта</string>
-    <string name="settings_allow_content_provider_read_summary">Приложенията ще искат разрешение, за да получат достъп</string>
-    <string name="settings_oled_dark_summary">Намалява разхода на батерия от OLED дисплеи</string>
-    <string name="settings_category_title_cards">Карти</string>
-    <string name="settings_category_title_general">Общи</string>
-    <string name="settings_category_title_privacy">Поверителност</string>
-    <string name="settings_keep_screen_on_summary">Спира автоматичното заключване на екрана при преглед на карти</string>
 </resources>
--- a/app/src/main/res/values-bn-rIN/strings.xml
+++ b/app/src/main/res/values-bn-rIN/strings.xml
@@ -21,9 +21,11 @@
    <string name="intent_import_card_from_url_share_text">url শেয়ার টেক্সট থেকে ইন্টেন্ট ইম্পোর্ট কার্ড</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>
+    <string name="settings_category_title_ui">বিভাগ শিরোনাম</string>
    <string name="starImage">তারা ছবি</string>
    <string name="importCatima">ক্যাতিনা আগম</string>
    <string name="importLoyaltyCardKeychain">আমদানি লয়্যালটি কার্ড কীচেন</string>
@@ -63,6 +65,7 @@
    <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>
@@ -93,13 +96,14 @@
    <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">বারকোড স্ক্যান করার জন্য, Catima কে ক্যামেরাটি ব্যবহার করার অনুমতি দিতে হবে। এইখানে টাচ করে আপনার অনুমতি সেটিংস পালটে নিন।</string>
-    <string name="importOptionApplicationExplanation">একটি ফাইল খোলার জন্য যেকোনো অ্যাপ বা আপনার প্রিয় ফাইল ম্যানেজারটি ব্যবহার করুন।</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">মেধাস্বত্ব © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
-    <string name="app_license">কপিলেফট দ্বারা রক্ষা করা মুক্ত সফটওয়্যার, লাইসেন্স করা GPLv3+ এর অধীনে</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>
@@ -113,10 +117,11 @@
        <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="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="about_title_fmt"><xliff:g id="app_name">%s</xliff:g>টির ব্যাপারে</string>
+    <string name="app_revision_fmt">সংশোধন তথ্য: <xliff:g id="app_revision_url">%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>
@@ -141,12 +146,12 @@
    <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="exportOptionExplanation">তথ্যটি আপনার পছন্দের জায়গায় রাখা হবে।</string>
+    <string name="importOptionFilesystemTitle">ফোনের স্টোরেজ থেকে আনুন</string>
+    <string name="importOptionFilesystemButton">ফোনের স্টোরেজ থেকে</string>
    <string name="importOptionApplicationTitle">অন্য অ্যাপ ব্যবহার করুন</string>
-    <string name="app_copyright_old">Loyalty Card Keychain এর উপর ভিত্তি করে
-\nমেধাস্বত্ব © 2016–2020 Branden Archer</string>
+    <string name="app_copyright_old">লয়ালটি কার্ড কিচ্যেনের উপর ভিত্তি করে
+\nমেধাস্বত্ব © ২০১৬-২০২০ ব্রানডেন আর্চার</string>
    <string name="selectBarcodeTitle">বারকোড নির্বাচন করুন</string>
    <string name="settings">সেটিংস</string>
    <string name="settings_dark_theme">অন্ধকার</string>
@@ -180,6 +185,7 @@
    <string name="balanceSentence">ব্যালেন্স: <xliff:g>%s</xliff:g></string>
    <string name="chooseExpiryDate">মেয়াদ শেষ হওয়ার তারিখ মনোনীত করুন</string>
    <string name="moveBarcodeToTopOfScreen">বারকোডটি স্ক্রিনের উপরে উঠিয়ে দিন</string>
+    <string name="moveBarcodeToCenterOfScreen">বারকোডটি স্ক্রিনের কেন্দ্রে সরিয়ে দিন</string>
    <string name="errorReadingImage">ছবিটি স্ক্যান করা যাচ্ছে না</string>
    <string name="privacy_policy_popup_text">ব্যক্তিগত তথ্যের গোপনীয়তা নীতি নোটিশ (কিছু অ্যাপ স্টোরের এটি লাগে):
 \n
@@ -191,85 +197,4 @@
    <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>
-    <string name="show_name_below_image_thumbnail">ছবির থাম্বনেইল এর নিচে নামটি দেখান</string>
-    <string name="show_note">নোট দেখান</string>
-    <string name="show_validity">বৈধতা দেখান</string>
-    <string name="height">উচ্চতা:</string>
-    <string name="switchToBackImage">পিছনের ছবিটিতে সুইচ করুন</string>
-    <string name="switchToFrontImage">সামনের ছবিটিতে সুইচ করুন</string>
-    <string name="switchToBarcode">বারকোডে সুইচ করুন</string>
-    <string name="openFrontImageInGalleryApp">সামনের ছবিটি গ্যালারি অ্যাপে খুলুন</string>
-    <string name="openBackImageInGalleryApp">পিছনের ছবিটি গ্যালারি অ্যাপে খুলুন</string>
-    <string name="setBarcodeHeight">বারকোডের উচ্চতা সেট করুন</string>
-    <string name="icon_header_click_text">দীর্ঘক্ষন টাচ করে থাম্বনেইল এডিট করবেন</string>
-    <string name="show_balance">ব্যালান্স দেখান</string>
-    <string name="donate">দান করুন</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -18,6 +18,7 @@
    <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,7 +53,4 @@
    </plurals>
    <string name="deleteTitle">কার্ড মুছুন</string>
    <string name="noGiftCards">একটি কার্ড যোগ করতে + প্লাস বোতামে ক্লিক করুন বা ⋮ মেনু থেকে আমদানি করুন।</string>
-    <string name="cardShortcut">কার্ড শর্টকাট</string>
-    <string name="noCardsMessage">প্রথমে একটি কার্ড যোগ করুন</string>
-    <string name="card_ids_copied">আইডি কপি করা হয়েছে</string>
 </resources>
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -21,9 +21,11 @@
    <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>
+    <string name="settings_category_title_ui">Korisničko okruženje</string>
    <string name="starImage">Omiljena zvijezda</string>
    <string name="importCatima">Uvezi iz Catima</string>
    <string name="importLoyaltyCardKeychain">Uvezi iz Loyalty Card Keychain</string>
@@ -63,6 +65,7 @@
    <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>
@@ -110,4 +113,4 @@
    <string name="importOptionApplicationExplanation">Koristi bilo koju aplikaciju ili Vašu omiljenu aplikaciju da bi otvorili file.</string>
    <string name="importOptionApplicationButton">Koristi drugu aplikaciju</string>
    <string name="about">O</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -13,5 +13,4 @@
    <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>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -39,15 +39,18 @@
    <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">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">Založeno na Loyalty Card Keychain
@@ -81,10 +84,12 @@
    <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>
    <string name="settings_theme">Vzhled</string>
+    <string name="settings_category_title_ui">Uživatelské rozhraní</string>
    <string name="settings">Nastavení</string>
    <string name="card">Karta</string>
    <string name="balanceSentence">Zůstatek: <xliff:g>%s</xliff:g></string>
@@ -184,9 +189,11 @@
    <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>
@@ -202,7 +209,7 @@
    <string name="exportPassword">Nastavení hesla pro ochranu exportu (volitelné)</string>
    <string name="exportPasswordHint">Zadejte heslo</string>
    <string name="selectColor">Vybrat barvu</string>
-    <string name="setIcon">Nastavit miniaturu</string>
+    <string name="setIcon">Nastavit ikonu</string>
    <string name="group_edit">Upravit skupinu</string>
    <string name="group_name_already_in_use">Název skupiny je již použitý</string>
    <string name="group_name_is_empty">Název skupiny nemůže být prázdný</string>
@@ -214,7 +221,9 @@
    <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="options">Volby</string>
    <plurals name="balancePoints">
        <item quantity="one"><xliff:g>%s</xliff:g> bod</item>
@@ -266,28 +275,4 @@
    <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 miniaturu upravíte</string>
-    <string name="show_name_below_image_thumbnail">Zobrazit název pod obrázkem miniatury</string>
-    <string name="show_note">Zobrazit poznámku</string>
-    <string name="show_validity">Zobrazit platnost</string>
-    <string name="show_balance">Zobrazit zůstatek</string>
-    <string name="permissionReadCardsDescription">Číst vaše karty a všechny jejich podrobnosti, včetně poznámek a obrázků</string>
-    <string name="settings_allow_content_provider_read_summary">Aplikace stále budou muset požádat o povolení k poskytnutí přístupu</string>
-    <string name="permissionReadCardsLabel">Číst karty Catima</string>
-    <string name="settings_allow_content_provider_read_title">Umožnit ostatním aplikacím přístup k mým datům</string>
-    <string name="settings_keep_screen_on_summary">Zakáže časový limit obrazovky při prohlížení karty</string>
-    <string name="settings_oled_dark_summary">Snižuje používání baterie na displejích OLED</string>
-    <string name="settings_category_title_privacy">Soukromí</string>
-    <string name="settings_display_barcode_max_brightness_summary">Nezbytné pro některé skenery, aby fungovaly</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">Zakáže zamčení obrazovky při prohlížení karty</string>
-    <string name="settings_category_title_cards">Karty</string>
-    <string name="settings_category_title_general">Obecné</string>
 </resources>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -48,6 +48,7 @@
    <string name="settings_dark_theme">Mørk</string>
    <string name="settings_light_theme">Lys</string>
    <string name="settings_theme">Tema</string>
+    <string name="settings_category_title_ui">Brugergrænseflade</string>
    <string name="settings">Indstillinger</string>
    <string name="starImage">Favorit stjerne</string>
    <string name="thumbnailDescription">Miniaturebillede til kort</string>
@@ -88,4 +89,4 @@
    <string name="moveDown">Bevæger sig nedad</string>
    <string name="leaveWithoutSaveTitle">Afslut</string>
    <string name="addManually">Indtast kort-ID manuelt</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -46,10 +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">Displayhelligkeit in der Barcodeansicht erhöhen</string>
    <string name="exportSuccessful">Daten exportiert</string>
    <string name="importSuccessful">Daten importiert</string>
@@ -91,11 +93,13 @@
    <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>
@@ -125,6 +129,7 @@
    <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>
@@ -179,7 +184,9 @@
    <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>
@@ -203,13 +210,15 @@
    <string name="editGroup">Gruppe wird bearbeitet: <xliff:g>%s</xliff:g></string>
    <string name="group_edit">Gruppe bearbeiten</string>
    <string name="noGiftCardsGroup">Erstelle einige Karten und ordne sie dann hier der Gruppe zu.</string>
-    <string name="setIcon">Vorschau setzen</string>
+    <string name="setIcon">Symbol einstellen</string>
    <string name="selectColor">Farbe auswählen</string>
    <string name="action_show_details">Details anzeigen</string>
    <string name="action_hide_details">Details ausblenden</string>
    <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">
@@ -259,21 +268,4 @@
    <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>
-    <string name="icon_header_click_text">Langes Drücken zum Bearbeiten der Vorschau</string>
-    <string name="switchToBarcode">Umschalten auf Barcode</string>
-    <string name="openFrontImageInGalleryApp">Vorderes Bild in der Galerie öffnen</string>
-    <string name="openBackImageInGalleryApp">Hinteres Bild in der Galerie öffnen</string>
-    <string name="height">Höhe:</string>
-    <string name="switchToFrontImage">Zum vorderen Bild wechseln</string>
-    <string name="switchToBackImage">Zum hinteren Bild wechseln</string>
-    <string name="setBarcodeHeight">Barcode-Höhe einstellen</string>
-    <string name="donate">Spenden</string>
-    <string name="show_note">Notiz anzeigen</string>
-    <string name="show_balance">Betrag anzeigen</string>
-    <string name="show_validity">Gültigkeitsdauer anziegen</string>
-    <string name="show_name_below_image_thumbnail">Namen unter Bildvorschau anzeigen</string>
-    <string name="settings_allow_content_provider_read_title">Anderen Anwendungen den Zugriff auf meine Daten gestatten</string>
-    <string name="permissionReadCardsLabel">Catima-Karten lesen</string>
-    <string name="permissionReadCardsDescription">Lesen Sie Ihre Karten mit allen Details, einschließlich Notizen und Bildern</string>
-    <string name="settings_allow_content_provider_read_summary">Anwendungen müssen weiterhin eine Genehmigung beantragen, um Zugriff zu erhalten</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -42,13 +42,16 @@
    <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>
    <string name="settings">Ρυθμίσεις</string>
+    <string name="settings_category_title_ui">Διεπαφή χρήστη</string>
    <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>
@@ -81,6 +84,8 @@
    <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>
@@ -92,6 +97,7 @@
    <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>
@@ -107,6 +113,7 @@
    <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>
@@ -189,6 +196,7 @@
    <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>
@@ -203,6 +211,7 @@
    <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>
@@ -253,4 +262,4 @@
    <string name="newBalanceSentence">Νέο υπόλοιπο: <xliff:g>%s</xliff:g></string>
    <string name="failedToOpenUrl">Εγκαταστήστε έναν περιηγητή πρώτα</string>
    <string name="welcome">Καλώς ήρθατε στο Catima</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -5,6 +5,7 @@
    <string name="noBarcode">Sen strekokodo</string>
    <string name="barcodeType">Tipo de strekokodo</string>
    <string name="cardId">Identigilo de karto</string>
+    <string name="settings_category_title_ui">Fasado</string>
    <string name="settings">Agordoj</string>
    <string name="selectBarcodeTitle">Elekti strekokodon</string>
    <string name="debug_version_fmt">Versio: <xliff:g id="version">%s</xliff:g></string>
@@ -30,6 +31,7 @@
    <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>
@@ -51,6 +53,7 @@
    <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
@@ -81,9 +84,4 @@
    <string name="intent_import_card_from_url_share_text">Mi deziras dividi karto kun vi</string>
    <string name="exportSuccessful">Karto datumo eksportita</string>
    <string name="noGroupCards">Ĉi tiu grupo ne enhavas ajnan kartoj</string>
-    <string name="noGiftCards">Klavu la \"+\" butonon por aldoni karton, aŭ importu uzi menuo \" ⋮\".</string>
-    <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> elektita</item>
-        <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> elektitaj</item>
-    </plurals>
-</resources>
+</resources>
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -1,5 +1,6 @@
 <?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>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -43,6 +43,7 @@
    <string name="about_title_fmt">Acerca de <xliff:g id="app_name">%s</xliff:g></string>
    <string name="debug_version_fmt">Versión: <xliff:g id="version">%s</xliff:g></string>
    <string name="settings">Ajustes</string>
+    <string name="settings_category_title_ui">Interfaz de usuario</string>
    <string name="settings_display_barcode_max_brightness">Iluminar vista del código de barras</string>
    <string name="exportSuccessful">Datos exportados</string>
    <string name="importSuccessful">Datos importados</string>
@@ -61,6 +62,7 @@
    <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>
@@ -86,17 +88,20 @@
        <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.
@@ -198,16 +203,19 @@
    <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>
@@ -215,8 +223,9 @@
    <string name="translate_platform">en Weblate</string>
    <string name="action_show_details">Mostrar detalles</string>
    <string name="selectColor">Seleccione el color</string>
-    <string name="setIcon">Establecer una miniatura</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>
@@ -266,17 +275,4 @@
    <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>
-    <string name="icon_header_click_text">Pulsación larga para editar la miniatura</string>
-    <string name="show_name_below_image_thumbnail">Mostrar el nombre debajo de la miniatura de la imagen</string>
-    <string name="show_note">Mostrar la nota</string>
-    <string name="show_validity">Mostrar la validez</string>
-    <string name="show_balance">Mostrar el saldo</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -36,11 +36,13 @@
    <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>
@@ -68,10 +70,12 @@
    <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">Suosikkitähti</string>
    <string name="thumbnailDescription">Pienoiskuva</string>
@@ -80,6 +84,7 @@
    <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">Vapaat kolmannen osapuolen 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="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>
@@ -189,9 +194,11 @@
    </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ä, paina kuvaa pitkään avataksesi galleriasovelluksessa</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>
@@ -207,7 +214,9 @@
    <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>
@@ -259,4 +268,4 @@
    <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>
+</resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -42,10 +42,12 @@
    <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>
    <string name="settings">Paramètres</string>
+    <string name="settings_category_title_ui">Interface utilisateur</string>
    <string name="settings_display_barcode_max_brightness">Augmenter la luminosité du code-barres</string>
    <string name="exportSuccessful">Données exportées</string>
    <string name="importSuccessful">Données importées</string>
@@ -96,11 +98,13 @@
    <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>
@@ -125,6 +129,7 @@
    <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>
@@ -183,12 +188,14 @@
    <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>
@@ -207,7 +214,7 @@
    <string name="group_name_already_in_use">Nom de groupe déjà utilisé</string>
    <string name="group_updated">Groupe mis à jour</string>
    <string name="group_name_is_empty">Le nom du groupe ne peut pas être vide</string>
-    <string name="setIcon">Définir la vignette</string>
+    <string name="setIcon">Définir l’icône</string>
    <string name="selectColor">Sélectionnez la couleur</string>
    <string name="action_show_details">Afficher les détails</string>
    <string name="action_hide_details">Masquer les détails</string>
@@ -215,7 +222,9 @@
    <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>
@@ -266,21 +275,4 @@
    <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">Appuyez longuement pour modifier la vignette</string>
-    <string name="show_name_below_image_thumbnail">Afficher le nom sous la vignette de l\'image</string>
-    <string name="show_note">Afficher la note</string>
-    <string name="show_validity">Afficher la validité</string>
-    <string name="show_balance">Afficher le solde</string>
-    <string name="permissionReadCardsLabel">Lire les cartes Catima</string>
-    <string name="permissionReadCardsDescription">Lisez vos cartes et tous ses détails, y compris les notes et les images</string>
-    <string name="settings_allow_content_provider_read_title">Autoriser d\'autres applications à accéder à mes données</string>
-    <string name="settings_allow_content_provider_read_summary">Les applications devront toujours demander une autorisation pour obtenir l\'accès</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -63,11 +63,13 @@
    <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>
    <string name="noCameraPermissionDirectToSystemSetting">बारकोड स्कैन करने के लिए,को आपके कैमरा का इस्तेमाल करना होगा। इजाज़त कि व्यवस्था (सेटिंग) बदलने के लिए यहाँ दबायें।</string>
    <string name="importOptionApplicationExplanation">फाइल खोलने के लिए कोई भी ऐप या अपना पसंदिता फाइल मैनेजर का इस्तेमाल करे।</string>
+    <string name="settings_category_title_ui">उपयोक्‍ता अंतरापृष्‍ठ (यूजर इंटरफ़ेस)</string>
    <string name="settings_theme">विषय</string>
    <string name="barcodeType">बारकोड का प्रकार</string>
    <string name="barcodeNoBarcode">कोई बारकोड नहीं है</string>
@@ -100,11 +102,13 @@
    <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>
@@ -144,5 +148,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="copy_to_clipboard_toast">आई डी क्लिपबोर्ड पर कॉपी किया गया</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1,282 +1,83 @@
 <?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">
+<resources>
    <string name="unstar">Ukloni iz favorita</string>
-    <string name="action_search">Pretraži</string>
+    <string name="action_search">Pretraživanje</string>
    <string name="save">Spremi</string>
    <string name="edit">Uredi</string>
    <string name="delete">Ukloni</string>
    <string name="confirm">Potvrdi</string>
-    <string name="deleteTitle">Izbriši karticu</string>
+    <string name="deleteTitle">Ukloni kartu</string>
    <string name="deleteConfirmation">Izbrisati ovu karticu zauvijek\?</string>
    <string name="copy_to_clipboard">Kopiraj ID u međuspremnik</string>
-    <string name="share">Dijeli</string>
-    <string name="sendLabel">Pošalji …</string>
+    <string name="share">Podijeli</string>
+    <string name="sendLabel">Pošalji…</string>
    <string name="editCardTitle">Uredi karticu</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="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="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">Bilješka</string>
+    <string name="note">Napomena</string>
    <string name="noMatchingGiftCards">Nema rezultata. Pokušajte promijeniti pretraživanje.</string>
    <string name="cardId">ID kartice</string>
    <string name="barcodeType">Vrsta crtičnog koda</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="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="exportName">Izvoz</string>
-    <string name="importExportHelp">Spremanje sigurnosnih kopija tvojih podataka omogućuje premještanje podataka na jedan drugi uređaj.</string>
+    <string name="importExportHelp">Sigurnosno kopiranje kartica omogućuje vam da ih premjestite na drugi uređaj.</string>
    <string name="importSuccessfulTitle">Uvezeno</string>
-    <string name="importFailedTitle">Neuspio uvoz</string>
-    <string name="importFailed">Nije bilo moguće izvršiti uvoz</string>
+    <string name="importFailedTitle">Nije moguće uvesti</string>
+    <string name="importFailed">Nije moguće uvesti karte</string>
    <string name="exportSuccessfulTitle">Izvezeno</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="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="importOptionFilesystemExplanation">Odaberite određenu datoteku iz datotečnog sustava.</string>
+    <string name="importOptionApplicationTitle">Koristite drugu aplikaciju</string>
    <string name="settings">Postavke</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="settings_dark_theme">Tamno</string>
+    <string name="exportFailed">Nije moguće izvesti karte</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">Za otvaranje datoteke koristi bilo koju aplikaciju ili tvoj omiljeni upravljač datoteka.</string>
+    <string name="importOptionApplicationExplanation">Koristite bilo koju aplikaciju ili omiljeni upravitelj datoteka za otvaranje datoteke.</string>
    <string name="settings_theme">Tema</string>
    <string name="settings_system_theme">Sustav</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="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="starImage">Omiljena zvijezda</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="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="groups">Grupe</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 sličicu</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">Privjesak za Karticu Vjernosti</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>
-    <string name="icon_header_click_text">Dugim pritiskom uredite sličicu</string>
-    <string name="show_name_below_image_thumbnail">Prikaži ime ispod sličice</string>
-    <string name="show_note">Prikaži bilješku</string>
-    <string name="show_balance">Prikaži saldo</string>
-    <string name="show_validity">Prikaži valjanost</string>
-</resources>
+    <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="noGiftCardsGroup">Izradite neke kartice, a zatim ih dodijelite grupi ovdje.</string>
+</resources>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -4,149 +4,154 @@
    <string name="action_add">Hozzáadás</string>
    <string name="action_search">Keresés</string>
    <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> kiválasztva</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> kiválasztva</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> kiválasztott</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kiválasztottak</item>
    </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 találaat. Próbálja módosítani a keresést.</string>
+    <string name="noMatchingGiftCards">Nincs eredmény. 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ártyaazonosító</string>
-    <string name="barcodeType">Vonalkód típusa</string>
+    <string name="cardId">Kártya azonosító</string>
+    <string name="barcodeType">Vonalkód típus</string>
    <string name="barcodeNoBarcode">Nincs vonalkód</string>
    <string name="noBarcode">Nincs vonalkód</string>
-    <string name="star">Hozzáadás a kedvencekhez</string>
-    <string name="unstar">Eltávolítás a kedvencekből</string>
+    <string name="star">Kedvencekhez adás</string>
+    <string name="unstar">Kivétel a kedvencek közü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">Jóváhagyás</string>
+    <string name="confirm">Jóváhagy</string>
    <plurals name="deleteCardsTitle">
-        <item quantity="one"><xliff:g>%d</xliff:g> kártya törlése</item>
+        <item quantity="one">Törölje az <xliff:g>%d</xliff:g> kártyát</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ó vágólapra másolása</string>
+    <string name="copy_to_clipboard">Azonosító másolása a vágólapra</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 leolvasása</string>
+    <string name="scanCardBarcode">Vonalkód szkennelése</string>
    <string name="cardShortcut">Kártya parancsikon</string>
    <string name="noStoreError">Nincs név megadva</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="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="importSuccessfulTitle">Importálva</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="importFailedTitle">Importálás meghiúsult</string>
+    <string name="importFailed">Importálás nem hajtható végre</string>
    <string name="exportSuccessfulTitle">Exportálva</string>
-    <string name="exportFailedTitle">Az exportálás sikertelen</string>
+    <string name="exportFailedTitle">Exportálás meghiúsult</string>
    <plurals name="deleteCardsConfirmation">
-        <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>
+        <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>
    </plurals>
    <string name="deleteTitle">Kártya törlése</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="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="noCardIdError">Nincs azonosító megadva</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="noCardExistsError">Kártya nem található</string>
+    <string name="importStocardMessage">Válassza ki a <i>***.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="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">Adja meg a jelszót</string>
+    <string name="passwordRequired">Kérem írja be a kódot</string>
    <string name="settings_catima_theme">Catima</string>
    <string name="exportPasswordHint">Kód beírása</string>
-    <string name="failedGeneratingShareURL">Nem lehetett megosztható webcímet előállítani. Kérjük, ezt jelentse.</string>
+    <string name="failedGeneratingShareURL">Nem lehetett megosztható címet generálni. Kérem jelentse ezt.</string>
    <string name="settings_theme_color">Téma színe</string>
    <string name="settings_grey_theme">Szürke</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="sort">Rendez</string>
+    <string name="on_google_play">Google Play-en</string>
+    <string name="action_show_details">Részletek mutatása</string>
    <string name="action_hide_details">Részletek elrejtése</string>
-    <string name="and_data_usage">és adathasználat</string>
-    <string name="translate_platform">a Weblate-en</string>
+    <string name="and_data_usage">és adat használat</string>
+    <string name="translate_platform">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 alkalmazást</string>
-    <string name="exportFailed">Nem sikerült az exportálás végrehajtása</string>
+    <string name="rate_this_app">Értékelje az appot</string>
+    <string name="exportFailed">Exportálás sikertelen</string>
    <string name="importing">Importálás…</string>
    <string name="exporting">Exportálás…</string>
-    <string name="exportOptionExplanation">Az adatok a kiválasztott helyre lesznek mentve.</string>
+    <string name="exportOptionExplanation">Az adatokat a kiválasztott helyre fogjuk menteni.</string>
    <string name="importOptionFilesystemTitle">Importálás fájlrendszerből</string>
    <string name="importOptionFilesystemButton">A fájlrendszerből</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="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="debug_version_fmt">Verzió: <xliff:g id="version">%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="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="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” lehetőséget.</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="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>
+    <string name="settings_category_title_ui">Felhasználói felület</string>
    <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_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="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="intent_import_card_from_url_share_text">Meg akarok veled osztani egy kártyát</string>
-    <string name="importSuccessful">Adatok importálva</string>
-    <string name="exportSuccessful">Adatok exportálva</string>
+    <string name="importSuccessful">Adat importálva</string>
+    <string name="exportSuccessful">Adat 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">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="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="leaveWithoutSaveTitle">Kilépés</string>
    <string name="leaveWithoutSaveConfirmation">Kilépés mentés nélkül\?</string>
-    <string name="addManually">Azonosító kézi beírása</string>
+    <string name="addManually">Azonosító manuális 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">Lejárat: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Érvényes: <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">Pénznem</string>
+    <string name="currency">Valuta</string>
    <string name="points">Pontok</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="parsingBalanceFailed">A <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 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="sameAsCardId">Ugyanaz, mint az azonosító</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="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="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>
@@ -154,133 +159,113 @@
    <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ót. Ennek megfelelően megváltoztatja 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ó. Meg akarja ennek megfelelően változtatni a vonalkód értéket is\?</string>
    <string name="yes">Igen</string>
-    <string name="exportPassword">Állítson be egy jelszót az export védelme érdekében (nem kötelező)</string>
+    <string name="exportPassword">Írjon be egy jelszót az export védelme érdekében (opcionális)</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>
    <string name="settings_system_locale">Rendszer</string>
    <string name="selectColor">Szín kiválasztása</string>
-    <string name="setIcon">Miniatűr beállítá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">Bíbor</string>
-    <string name="settings_violet_theme">Ibolya</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_violet_theme">Ibolyaszínű</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é 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="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">Csúsztassa ujját a képek váltásához, tartsa lenyomva a kép megnyitásához a Galéria alkalmazásban</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="credits">Köszönet</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="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="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ártya</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kártyák</item>
    </plurals>
    <plurals name="balancePoints">
        <item quantity="one"><xliff:g>%s</xliff:g> pont</item>
        <item quantity="other"><xliff:g>%s</xliff:g> pontok</item>
    </plurals>
-    <string name="chooseImportType">Adatok importálása innen</string>
+    <string name="chooseImportType">Adat 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 alkalmazás használata</string>
+    <string name="importOptionApplicationButton">Másik app használata</string>
    <string name="about">Névjegy</string>
    <string name="app_copyright_old">Készült a Loyalty Card Keychain alapján
-\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>
+\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>
    <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">A csoportnév már létezik</string>
-    <string name="all">Összes</string>
+    <string name="group_name_already_in_use">Csoport név már létezik</string>
+    <string name="all">Mind</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 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):
+    <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):
 \n
-\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>
+\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>
    <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á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>
    </plurals>
    <string name="noUnarchivedCardsMessage">Nincs archiválatlan kártya</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="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="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 a kártya megnyitásakor</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_landscape_orientation">Fekvő</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="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="unarchive">Archiválás megszüntetése</string>
-    <string name="archived">Kártya archiválva</string>
-    <string name="archiveList">Archívum</string>
-    <string name="duplicateCard">Klónozás</string>
+    <string name="archived">Kártya archiválása</string>
+    <string name="archiveList">Archivál</string>
+    <string name="duplicateCard">Másolat</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="updateBalanceTitle">Mennyit költöttél\?</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>
+    <string name="unarchived">Archiválatlan kártya</string>
+    <string name="welcome">Üdvözöljük 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>
+        <item quantity="other">Archívum megtekintése (<xliff:g>%1$d</xliff:g> kártyák)</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="noCameraPermissionDirectToSystemSetting">A vonalkódok beolvasá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="chooseValidFromDate">Válassza ki az érvényesség kezdeti dátumot</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">Hosszan nyomja meg a miniatűr szerkesztéséhez</string>
-    <string name="show_note">Megjegyzés megjelenítése</string>
-    <string name="show_balance">Egyenleg megjelenítése</string>
-    <string name="permissionReadCardsLabel">Catima kártyák olvasása</string>
-    <string name="permissionReadCardsDescription">Olvassa el a kártyáit és annak minden részletét, beleértve a jegyzeteket és a képeket is</string>
-    <string name="show_validity">Érvényesség megjelenítése</string>
-    <string name="show_name_below_image_thumbnail">Név megjelenítése a kép miniatűrje alatt</string>
-    <string name="settings_display_barcode_max_brightness_summary">Szükséges egyes szkennerek működéséhez</string>
-    <string name="settings_oled_dark_summary">Csökkenti az OLED kijelzők akkumulátor-használatát</string>
-    <string name="settings_category_title_privacy">Adatvédelem</string>
-    <string name="settings_allow_content_provider_read_title">Engedélyezem más alkalmazások számára az adataimhoz való hozzáférést</string>
-    <string name="settings_category_title_cards">Kártyák</string>
-    <string name="settings_category_title_general">Általános</string>
-    <string name="settings_keep_screen_on_summary">Letiltja a képernyő időtúllépését a kártya megtekintése közben</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">Letiltja a képernyő időtúllépését a kártya megjelenítése közben</string>
-    <string name="settings_allow_content_provider_read_summary">Az alkalmazásoknak továbbra is engedélyt kell kérniük a hozzáféréshez</string>
+    <string name="storageReadPermissionRequired">A művelethez tároló olvasási engedély szükséges…</string>
+    <string name="cameraPermissionRequired">A kamerához való hozzáférés engedélye szükséges ehhez a művelethez…</string>
 </resources>
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -1,5 +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="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>
@@ -13,6 +14,7 @@
    <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>
@@ -29,10 +31,12 @@
    <string name="barcodeNoBarcode">Tidak ada barcode</string>
    <string name="cancel">Batalkan</string>
    <string name="importExport">Impor/Ekspor</string>
+    <string name="settings_category_title_ui">Tampilan Pengguna</string>
    <string name="settings_theme">Tema</string>
    <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>
@@ -106,6 +110,7 @@
    <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>
@@ -114,6 +119,7 @@
    <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>
@@ -139,6 +145,7 @@
    <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">Gantungan kunci kartu kesetiaan</string>
@@ -170,6 +177,7 @@
    <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>
@@ -197,7 +205,7 @@
    <string name="selectColor">Pilih warna</string>
    <string name="noGiftCardsGroup">Buat beberapa kartu, kemudian masukkan mereka ke grup di sini.</string>
    <string name="group_name_already_in_use">Nama grup telah dipakai</string>
-    <string name="setIcon">Atur thumbnail</string>
+    <string name="setIcon">Atur ikon</string>
    <string name="settings_oled_dark">Latar belakang gelap gulita untuk tema gelap</string>
    <string name="group_edit">Sunting Grup</string>
    <string name="group_name_is_empty">Nama grup tidak boleh kosong</string>
@@ -225,7 +233,9 @@
        <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>
@@ -249,20 +259,8 @@
    <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: <xliff:g>%s</xliff:g></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>
-    <string name="show_validity">Tunjukkan validitas</string>
-    <string name="show_balance">Tunjukkan keseimbangan</string>
-    <string name="icon_header_click_text">Tekan lama untuk mengedit thumbnail</string>
-    <string name="show_name_below_image_thumbnail">Tampilkan nama di bawah thumbnail gambar</string>
-    <string name="show_note">Tampilkan catatan</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -40,10 +40,12 @@
    <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>
@@ -59,6 +61,7 @@
    <string name="settings_theme">Þema</string>
    <string name="app_license">Copylefted frítt hugbúnaður, leyfi GPLv3+</string>
    <string name="noBarcodeFound">Nei strikamerkið var komist</string>
+    <string name="settings_category_title_ui">Notandi tengi</string>
    <string name="settings_system_theme">Kerfi</string>
    <string name="settings_dark_theme">Dökk</string>
    <string name="settings_display_barcode_max_brightness">Bjartari strikamerkið skoða</string>
@@ -73,6 +76,7 @@
    <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>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -47,11 +47,13 @@
    <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>
    <string name="thumbnailDescription">Miniatura</string>
    <string name="settings">Impostazioni</string>
+    <string name="settings_category_title_ui">Interfaccia utente</string>
    <string name="settings_theme">Tema</string>
    <string name="settings_system_theme">Sistema</string>
    <string name="settings_light_theme">Chiaro</string>
@@ -89,11 +91,13 @@
    <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>
@@ -125,6 +129,7 @@
    <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>
@@ -183,8 +188,10 @@
    <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>
@@ -208,14 +215,16 @@
    <string name="group_name_already_in_use">Il nome del gruppo è già in uso</string>
    <string name="group_updated">Gruppo aggiornato</string>
    <string name="selectColor">Seleziona il colore</string>
-    <string name="setIcon">Imposta l\'immagine</string>
+    <string name="setIcon">Imposta l\'icona</string>
    <string name="action_show_details">Mostra i dettagli</string>
    <string name="action_hide_details">Nascondi i dettagli</string>
    <string name="translate_platform">su Weblate</string>
    <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>
@@ -237,9 +246,9 @@
    <string name="settings_lock_on_opening_orientation">Blocca sull\'orientamento utilizzato all\'apertura della carta</string>
    <string name="failedLaunchingPhotoPicker">Impossibile trovare un\'app galleria supportata</string>
    <plurals name="groupCardCountWithArchived">
-        <item quantity="one"><xliff:g>%1$d</xliff:g> carta (<xliff:g id="archivedCount">%2$d</xliff:g> archiviata)</item>
-        <item quantity="many"><xliff:g>%1$d</xliff:g> carte (<xliff:g id="archivedCount">%2$d</xliff:g> archiviate)</item>
-        <item quantity="other"><xliff:g>%1$d</xliff:g> carte (<xliff:g id="archivedCount">%2$d</xliff:g> archiviate)</item>
+        <item quantity="one"><xliff:g>%1$d</xliff:g> scheda (<xliff:g id="archivedCount">%2$d</xliff:g> archiviata)</item>
+        <item quantity="many"><xliff:g>%1$d</xliff:g> schede (<xliff:g id="archivedCount">%2$d</xliff:g> archiviate)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> schede (<xliff:g id="archivedCount">%2$d</xliff:g> archiviate)</item>
    </plurals>
    <string name="previousCard">Precedente</string>
    <string name="nextCard">Successivo</string>
@@ -266,21 +275,4 @@
    <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>
-    <string name="icon_header_click_text">Premi a lungo per modificare l\'immagine</string>
-    <string name="show_note">Mostra nota</string>
-    <string name="show_balance">Mostra bilancio</string>
-    <string name="show_validity">Mostra validità</string>
-    <string name="show_name_below_image_thumbnail">Mostra il nome sotto l\'immagine</string>
-    <string name="permissionReadCardsLabel">Leggi le carte Catima</string>
-    <string name="settings_allow_content_provider_read_summary">Le applicazioni dovranno comunque richiedere l\'autorizzazione per ottenere l\'accesso</string>
-    <string name="settings_allow_content_provider_read_title">Consenti ad altre applicazioni di accedere ai miei dati</string>
-    <string name="permissionReadCardsDescription">Leggi le tue carte e tutti i suoi dettagli, comprese le note e le immagini</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -25,11 +25,13 @@
    <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>
@@ -56,10 +58,12 @@
    <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>
    <string name="settings_theme">テーマ</string>
+    <string name="settings_category_title_ui">外観</string>
    <string name="settings">設定</string>
    <string name="starImage">お気に入りのスター</string>
    <string name="thumbnailDescription">サムネイル</string>
@@ -67,6 +71,7 @@
    <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>
@@ -175,7 +180,9 @@
    <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>
@@ -204,4 +211,4 @@
    <string name="group_name_is_empty">グループ名を入力してください</string>
    <string name="shortcutSelectCard">カードを選択してください</string>
    <string name="translate_platform">on Weblate</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/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="addManually">직접 ID 입력</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="addManually">직접 카드 ID 입력</string>
    <string name="groupsList">그룹: <xliff:g>%s</xliff:g></string>
    <string name="all">모두</string>
    <string name="groups">그룹</string>
@@ -11,8 +11,10 @@
    <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="enterBarcodeInstructions">카드 ID를 입력하고 카드에서 사용하는 바코드 이미지를 선택하세요. 바코드를 사용하지 않는 경우 “이 카드는 바코드가 없음”을 선택하세요.</string>
+    <string name="app_revision_fmt">리비전 정보: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="selectBarcodeTitle">바코드 선택</string>
    <string name="about">정보</string>
    <string name="exporting">내보내는 중…</string>
@@ -27,8 +29,8 @@
    <string name="sendLabel">보내기…</string>
    <string name="share">공유</string>
    <string name="copy_to_clipboard">ID를 클립보드에 복사</string>
-    <string name="ok">OK</string>
-    <string name="confirm">확인하다</string>
+    <string name="ok">확인</string>
+    <string name="confirm">확인</string>
    <string name="delete">삭제</string>
    <string name="edit">편집</string>
    <string name="save">저장</string>
@@ -41,10 +43,12 @@
    <string name="cardId">카드 ID</string>
    <string name="note">노트</string>
    <string name="noMatchingGiftCards">아무것도 찾지 못했습니다. 검색어를 바꿔 보세요.</string>
-    <string name="noGiftCards">+ 더하기 버튼을 클릭하여 카드를 추가하거나 ⋮ 메뉴에서 가져옵니다.</string>
+    <string name="noGiftCards">먼저 \'+\' 버튼을 눌러 카드를 추가하세요.
+\n
+\nCatima는 카드를 장치에 보관하므로 어디서든 사용할 수 있습니다.</string>
    <string name="action_add">추가</string>
    <string name="action_search">검색</string>
-    <string name="copy_to_clipboard_toast">클립보드에 ID 복사됨</string>
+    <string name="copy_to_clipboard_toast">카드 ID를 클립보드에 복사함</string>
    <string name="importOptionApplicationTitle">다른 앱 사용</string>
    <string name="importOptionFilesystemExplanation">파일 시스템에서 파일을 선택합니다.</string>
    <string name="importOptionFilesystemTitle">파일 시스템에서 가져오기</string>
@@ -57,16 +61,17 @@
    <string name="importSuccessfulTitle">가져오기 완료</string>
    <string name="noCardIdError">ID를 입력하지 않았습니다</string>
    <string name="storeName">이름</string>
-    <string name="thumbnailDescription">썸네일</string>
+    <string name="thumbnailDescription">카드 섬네일</string>
    <string name="importOptionApplicationButton">다른 앱 사용</string>
    <string name="failedParsingImportUriError">가져온 URI를 분석할 수 없음</string>
    <string name="noCardExistsError">해당 카드를 찾을 수 없습니다</string>
-    <string name="moveUp">위로 이동</string>
-    <string name="leaveWithoutSaveTitle">종료</string>
-    <string name="moveDown">아래로 이동</string>
-    <string name="noStoreError">이름이 입력되지 않았습니다</string>
+    <string name="moveUp">목록에서 위로 옮기기</string>
+    <string name="leaveWithoutSaveTitle">저장하지 않고 종료</string>
+    <string name="moveDown">목록에서 아래로 옮기기</string>
+    <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">
@@ -74,195 +79,4 @@
    </plurals>
    <string name="noGiftCardsGroup">카드를 몇 장 만든 다음 여기에서 그룹에 할당합니다.</string>
    <string name="noCardsMessage">먼저 카드 추가</string>
-    <string name="leaveWithoutSaveConfirmation">저장하지 않고 나가시겠습니까\?</string>
-    <string name="intent_import_card_from_url_share_text">너의 카드를 공유하고 싶습니다</string>
-    <plurals name="groupCardCount">
-        <item quantity="other"><xliff:g>%d</xliff:g> 카드</item>
-    </plurals>
-    <string name="group_name_already_in_use">이미 사용 중인 그룹 이름</string>
-    <string name="addFromImage">갤러리에서 이미지 선택</string>
-    <string name="expiryStateSentenceExpired">만료: <xliff:g>%s</xliff:g></string>
-    <string name="card">카드</string>
-    <string name="editBarcode">바코드 편집</string>
-    <string name="expiryDate">만료일</string>
-    <string name="never">절대</string>
-    <string name="intent_import_card_from_url_share_multiple_text">나는 당신과 몇 가지 카드를 공유하고 싶습니다</string>
-    <string name="removeImage">이미지 삭제</string>
-    <string name="takePhoto">사진을 찍다</string>
-    <string name="yes">네</string>
-    <string name="no">아니오</string>
-    <string name="failedGeneratingShareURL">공유 가능한 URL을 생성할 수 없습니다. 이를 신고해 주십시오.</string>
-    <string name="turn_flashlight_off">손전등 끄기</string>
-    <string name="settings_locale">언어</string>
-    <string name="settings_system_locale">시스템</string>
-    <string name="selectColor">색상 선택</string>
-    <string name="settings_theme_color">테마 색상</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">핑크색</string>
-    <string name="settings_magenta_theme">자홍색</string>
-    <string name="settings_violet_theme">보라색</string>
-    <string name="settings_blue_theme">파란색</string>
-    <string name="app_contributors">가능한 : <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="showMoreInfo">정보 보기</string>
-    <string name="updateBalance">잔액 업데이트</string>
-    <string name="failedToRetrieveImageFile">이미지 파일을 검색하지 못했습니다</string>
-    <string name="barcodeLongPressMessage">갤러리 앱에서는 이미지만 열 수 있습니다</string>
-    <string name="sort_by_name">이름</string>
-    <string name="reverse">... 역순으로</string>
-    <string name="sort_by">정렬 기준</string>
-    <string name="version_history">버전 기록</string>
-    <string name="credits">학점</string>
-    <string name="license">특허</string>
-    <string name="source_repository">소스 저장소</string>
-    <string name="and_data_usage">및 데이터 사용량</string>
-    <string name="on_google_play">Google Play에서</string>
-    <string name="options">옵션</string>
-    <string name="starred">별표</string>
-    <string name="include_if_asking_support">지원을 요청하려면 다음 정보를 포함하십시오:</string>
-    <string name="archive">보관소</string>
-    <string name="unarchive">보관 취소</string>
-    <string name="archived">보관된 카드</string>
-    <string name="unarchived">보관되지 않은 카드</string>
-    <string name="archiveList">보관소</string>
-    <string name="failedLaunchingPhotoPicker">지원되는 갤러리 앱을 찾을 수 없습니다</string>
-    <string name="welcome">Catima 오신 것을 환영합니다</string>
-    <string name="validFromDate">유효</string>
-    <string name="anyDate">모든 날짜</string>
-    <string name="chooseValidFromDate">유효한 날짜를 선택하십시오</string>
-    <string name="validFromSentence">유효한 위치: <xliff:g>%s</xliff:g></string>
-    <string name="switchToFrontImage">전면 이미지로 전환</string>
-    <string name="switchToBackImage">뒤로 이미지로 전환</string>
-    <string name="switchToBarcode">바코드로 전환</string>
-    <string name="donate">기부하다</string>
-    <string name="show_name_below_image_thumbnail">이미지 축소판 아래에 이름 표시</string>
-    <string name="sort">종류</string>
-    <string name="sort_by_most_recently_used">가장 최근에 사용됨</string>
-    <string name="settings_keep_screen_on">화면 켜기</string>
-    <string name="unsupportedBarcodeType">이 바코드 유형은 아직 표시할 수 없습니다. 이후 버전의 앱에서 지원될 수 있습니다.</string>
-    <string name="sort_by_expiry">만료</string>
-    <string name="on_github">GitHub에서</string>
-    <string name="report_error">오류 신고</string>
-    <string name="rate_this_app">이 앱을 평가 해주세요</string>
-    <string name="translate_platform">Weblate에서</string>
-    <string name="shortcutSelectCard">카드 선택</string>
-    <string name="group_edit">그룹 편집</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> 이 유효한 잔액이 아닌 것 같습니다.</string>
-    <string name="chooseImportType">데이터 가져오기</string>
-    <string name="barcodeId">바코드 값</string>
-    <string name="setBackImage">이미지 설정</string>
-    <string name="exportSuccessful">내보낸 데이터</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">화면 잠금 방지</string>
-    <string name="group_updated">그룹 업데이트됨</string>
-    <string name="moveBarcodeToTopOfScreen">바코드를 화면 상단으로 이동</string>
-    <string name="height">키:</string>
-    <string name="openFrontImageInGalleryApp">갤러리 앱에서 전면 이미지 열기</string>
-    <string name="openBackImageInGalleryApp">갤러리 앱에서 다시 이미지 열기</string>
-    <string name="setBarcodeHeight">바코드 높이 설정</string>
-    <string name="setFrontImage">전면 이미지 설정</string>
-    <plurals name="selectedCardCount">
-        <item quantity="other"><xliff:g>%d</xliff:g> 선택된</item>
-    </plurals>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">저작권 © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
-    <string name="noCameraPermissionDirectToSystemSetting">바코드를 스캔하려면 Catima가 카메라에 액세스해야 합니다. 권한 설정을 변경하려면 여기를 탭하세요.</string>
-    <string name="exportOptionExplanation">데이터는 선택한 위치에 기록됩니다.</string>
-    <string name="app_license">GPL v3+에 따라 라이선스가 부여된 무료 소프트웨어</string>
-    <string name="failedOpeningFileManager">먼저 파일 관리자를 설치하십시오.</string>
-    <string name="importSuccessful">가져온 데이터</string>
-    <string name="group_name_is_empty">그룹 이름은 비워둘 수 없습니다</string>
-    <string name="chooseExpiryDate">만료일 선택</string>
-    <string name="settings_oled_dark">어두운 테마를 위한 검정색 배경</string>
-    <string name="action_show_details">세부정보 표시</string>
-    <string name="noGroups">+ 더하기 버튼을 클릭하여 분류할 그룹을 추가합니다.</string>
-    <string name="deleteConfirmationGroup">그룹을 삭제하시겠습니까\?</string>
-    <string name="errorReadingImage">이미지를 읽을 수 없습니다</string>
-    <string name="expiryStateSentence">만료: <xliff:g>%s</xliff:g></string>
-    <plurals name="balancePoints">
-        <item quantity="other"><xliff:g>%s</xliff:g> 포인트</item>
-    </plurals>
-    <string name="balanceSentence">잔액: <xliff:g>%s</xliff:g></string>
-    <string name="noBarcodeFound">바코드를 찾을 수 없습니다</string>
-    <string name="points">포인트</string>
-    <string name="balance">균형</string>
-    <string name="currency">통화</string>
-    <string name="accept">수용하다</string>
-    <string name="importLoyaltyCardKeychain">로열티 카드 키체인에서 가져오기</string>
-    <string name="wrongValueForBarcodeType">선택한 바코드 유형에 대해 값이 유효하지 않습니다</string>
-    <string name="copy_to_clipboard_multiple_toast">클립보드에 복사된 ID</string>
-    <string name="updateBarcodeQuestionText">아이디를 변경하셨습니다. 동일한 값을 사용하도록 바코드도 업데이트하시겠습니까\?</string>
-    <string name="exportPasswordHint">암호를 입력</string>
-    <string name="updateBarcodeQuestionTitle">바코드 값을 업데이트하시겠습니까\?</string>
-    <string name="turn_flashlight_on">손전등 켜기</string>
-    <string name="exportPassword">내보내기를 보호하기 위한 암호 설정(선택 사항)</string>
-    <string name="passwordRequired">비밀번호를 입력해주세요</string>
-    <string name="action_hide_details">상세정보 표시</string>
-    <string name="setIcon">썸네일 설정</string>
-    <string name="show_balance">잔액 표시</string>
-    <string name="help_translate_this_app">이 앱을 번역하도록 도와주세요</string>
-    <string name="duplicateCard">복제하다</string>
-    <string name="noUnarchivedCardsMessage">보관되지 않은 카드가 없습니다</string>
-    <plurals name="groupCardCountWithArchived">
-        <item quantity="other"><xliff:g>%1$d</xliff:g> 카드 (<xliff:g id="archivedCount">%2$d</xliff:g> 보관됨)</item>
-    </plurals>
-    <string name="updateBalanceHint">금액을 입력하세요</string>
-    <string name="show_note">메모 표시</string>
-    <string name="show_validity">유효성 표시</string>
-    <string name="icon_header_click_text">미리보기 이미지를 수정하려면 길게 누르세요</string>
-    <plurals name="deleteCardsConfirmation">
-        <item quantity="other">이 <xliff:g>%d</xliff:g> 카드를 영구적으로 삭제하시겠습니까\?</item>
-    </plurals>
-    <string name="card_ids_copied">복사된 ID</string>
-    <string name="barcodeImageDescriptionWithType">이미지 <xliff:g>%s</xliff:g> 바코드</string>
-    <string name="photos">사진</string>
-    <string name="storageReadPermissionRequired">이 작업에 필요한 저장소를 읽을 수 있는 권한…</string>
-    <string name="app_libraries">Libre 타사 라이브러리: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="cameraPermissionRequired">이 작업에 필요한 카메라 액세스 권한…</string>
-    <string name="cameraPermissionDeniedTitle">카메라에 액세스할 수 없습니다</string>
-    <string name="importOptionFilesystemButton">파일 시스템에서</string>
-    <string name="app_copyright_old">Loyalty Card Keychain 기반
-\n저작권 © 2016–2020 Branden Archer</string>
-    <string name="app_resources">Libre 타사 리소스: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="settings_lock_on_opening_orientation">카드를 열 때 사용되는 방향으로 고정</string>
-    <string name="editGroup">그룹 편집: <xliff:g>%s</xliff:g></string>
-    <string name="frontImageDescription">전면 이미지</string>
-    <string name="backImageDescription">뒷면 이미지</string>
-    <string name="currentBalanceSentence">현재 잔액: <xliff:g>%s</xliff:g></string>
-    <string name="importCards">카드 가져오기</string>
-    <string name="updateBalanceTitle">얼마를 썼습니까\?</string>
-    <string name="newBalanceSentence">새 잔액: <xliff:g>%s</xliff:g></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="noGroupCards">이 그룹은 비어 있습니다</string>
-    <string name="app_loyalty_card_keychain">로열티 카드 키체인</string>
-    <string name="privacy_policy">개인 정보 정책</string>
-    <string name="privacy_policy_popup_text">개인 정보 보호 정책 공지(일부 앱 스토어에서 필요):
-\n
-\n데이터가 전혀 수집되지 않습니다. 우리 앱은 무료 소프트웨어이기 때문에 누구나 확인할 수 있습니다.</string>
-    <string name="importCatima">Catima에서 가져오기</string>
-    <string name="importCatimaMessage">가져올 Catima에서 <i>catima.zip</i> 내보내기를 선택합니다.
-\n먼저 내보내기를 눌러 다른 Catima 앱의 가져오기/내보내기 메뉴에서 생성합니다.</string>
-    <string name="importFidme">FidMe에서 가져오기</string>
-    <string name="importFidmeMessage">가져올 FidMe에서 <i>fidme-export-request-xxxxxx.zip</i> 내보내기를 선택하고 나중에 바코드 유형을 수동으로 선택합니다.
-\n데이터 보호를 선택한 다음 먼저 내 데이터 추출을 눌러 FidMe 프로필에서 생성합니다.</string>
-    <string name="importLoyaltyCardKeychainMessage">가져올 포인트 카드 키체인에서 <i>LoyaltyCardKeychain.csv</i> 내보내기를 선택합니다.
-\n먼저 내보내기를 눌러 로열티 카드 키체인의 가져오기/내보내기 메뉴에서 만드십시오.</string>
-    <string name="setBarcodeId">바코드 값 설정</string>
-    <string name="importStocard">Stocard에서 가져오기</string>
-    <string name="importStocardMessage">가져올 Stocard에서 <i>***.zip</i> 내보내기를 선택합니다.
-\nsupport@stocardapp.com으로 이메일을 보내 데이터 내보내기를 요청하면 받을 수 있습니다.</string>
-    <string name="importVoucherVault">바우처 보관소에서 가져오기</string>
-    <string name="importVoucherVaultMessage">가져올 Voucher Vault에서 <i>vouchervault.json</i> 내보내기를 선택합니다.
-\n먼저 바우처 금고에서 내보내기를 눌러 생성하세요.</string>
-    <string name="sameAsCardId">아이디와 동일</string>
-    <string name="settings_grey_theme">회색</string>
-    <string name="settings_sky_blue_theme">하늘색</string>
-    <string name="settings_green_theme">초록색</string>
-    <string name="settings_brown_theme">갈색</string>
-    <plurals name="viewArchivedCardsWithCount">
-        <item quantity="other">보관소 보기 (<xliff:g>%1$d</xliff:g> 카)</item>
-    </plurals>
-    <string name="previousCard">이전의</string>
-    <string name="nextCard">다음</string>
-    <string name="failedToOpenUrl">먼저 웹 브라우저를 설치하십시오</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-lb/strings.xml
+++ b/app/src/main/res/values-lb/strings.xml
@@ -73,6 +73,7 @@
    <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>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -27,6 +27,7 @@
    <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,6 +49,7 @@
    <string name="importLoyaltyCardKeychain">Importuoti iš 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>
@@ -97,6 +99,7 @@
    <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>
@@ -124,10 +127,12 @@
    <string name="intent_import_card_from_url_share_text">Noriu pasidalyti su jumis kortele</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">Sistemos</string>
    <string name="settings_theme">Tema</string>
+    <string name="settings_category_title_ui">Vartotojo sąsaja</string>
    <string name="settings">Nustatymai</string>
    <string name="starImage">Mėgstamiausia žvaigždė</string>
    <string name="thumbnailDescription">Miniatiūra</string>
@@ -183,8 +188,10 @@
    <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>
@@ -227,6 +234,8 @@
        <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>
@@ -262,16 +271,4 @@
    <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>
+</resources>
--- a/app/src/main/res/values-lv/strings.xml
+++ b/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 no ⋮ izvēlnes.</string>
+    <string name="noGiftCards">Noklikšķiniet uz pogas + plus, lai pievienotu karti, vai vispirms importējiet dažus 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,6 +16,7 @@
    <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>
@@ -61,10 +62,12 @@
    <string name="thumbnailDescription">Sīktēls</string>
    <string name="starImage">Izlases zvaigzne</string>
    <string name="settings">Iestatījumi</string>
+    <string name="settings_category_title_ui">Interfeiss</string>
    <string name="settings_theme">Tēma</string>
    <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>
@@ -82,6 +85,7 @@
    <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>
@@ -91,6 +95,7 @@
    <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>
@@ -104,6 +109,7 @@
    </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>
@@ -137,6 +143,7 @@
    <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>
@@ -226,6 +233,8 @@
    <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>
@@ -247,14 +256,4 @@
    </plurals>
    <string name="failedToOpenUrl">Vispirms nepieciešams uzstādīt interneta pārlūku</string>
    <string name="welcome">Laipni lūgti Catima</string>
-    <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>
+</resources>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -44,11 +44,13 @@
    <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>
    <string name="thumbnailDescription">Miniatyrbilde</string>
    <string name="settings">Innstillinger</string>
+    <string name="settings_category_title_ui">Brukergrensesnitt</string>
    <string name="settings_display_barcode_max_brightness">Lysere strekkodevisning</string>
    <string name="exportSuccessful">Data eksportert</string>
    <string name="importSuccessful">Data importert</string>
@@ -85,12 +87,14 @@
    </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>
@@ -123,6 +127,7 @@
    <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>
@@ -177,8 +182,10 @@
    <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>
@@ -206,12 +213,14 @@
    <string name="action_show_details">Vis detaljer</string>
    <string name="action_hide_details">Skjul detaljer</string>
    <string name="selectColor">Velg farge</string>
-    <string name="setIcon">Sett miniatyrbilde</string>
+    <string name="setIcon">Sett ikon</string>
    <string name="shortcutSelectCard">velg et kort</string>
    <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>
@@ -259,28 +268,4 @@
    <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>
-    <string name="height">Høyde:</string>
-    <string name="switchToFrontImage">Bytt til frontbilde</string>
-    <string name="switchToBackImage">Bytt til baksidebildet</string>
-    <string name="switchToBarcode">Bytt til strekkode</string>
-    <string name="icon_header_click_text">Lang-trykk for å redigere miniatyrbilde</string>
-    <string name="show_name_below_image_thumbnail">Vis navn under bilde-miniatyrbilde</string>
-    <string name="show_balance">Vis saldo</string>
-    <string name="show_note">Vis notat</string>
-    <string name="show_validity">Vis gyldighet</string>
-    <string name="openFrontImageInGalleryApp">Åpne frontbilde i galleriprogrammet</string>
-    <string name="openBackImageInGalleryApp">Åpne baksidebilde i galleriprogram</string>
-    <string name="setBarcodeHeight">Sett strekkodehøyde</string>
-    <string name="donate">Doner</string>
-    <string name="permissionReadCardsLabel">Les Catima-kort</string>
-    <string name="permissionReadCardsDescription">Les kortene dine og detaljene om dem, inkludert notater og bilder</string>
-    <string name="settings_allow_content_provider_read_summary">Programmer vil fremdeles måtte forespørre tilgang for å få det innvilget</string>
-    <string name="settings_display_barcode_max_brightness_summary">Nødvendig for noen skannere</string>
-    <string name="settings_keep_screen_on_summary">Skrur av skjermtidsavbrudd under visning av et kort</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">Skrur av skjermlås under visning av et kort</string>
-    <string name="settings_allow_content_provider_read_title">Tillat andre programmer tilgang til min data</string>
-    <string name="settings_category_title_cards">Kort</string>
-    <string name="settings_category_title_general">Generelt</string>
-    <string name="settings_category_title_privacy">Personvern</string>
-    <string name="settings_oled_dark_summary">Reduserer batteribruk for OLED-skjermer</string>
 </resources>
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -27,18 +27,10 @@
        <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
    -->
--- a/app/src/main/res/values-nl/strings.xml
+++ b/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">Met een reservekopie van je gegevens kun je ze overzetten naar een ander apparaat.</string>
+    <string name="importExportHelp">Door je gegevens te back-uppen, 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>
@@ -49,15 +49,17 @@
    <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>
    <string name="thumbnailDescription">Miniatuurvoorbeeld</string>
    <string name="settings">Instellingen</string>
+    <string name="settings_category_title_ui">Vormgeving</string>
    <string name="settings_theme">Thema</string>
-    <string name="settings_system_theme">Systeemthema</string>
-    <string name="settings_light_theme">Licht thema</string>
-    <string name="settings_dark_theme">Donker thema</string>
+    <string name="settings_system_theme">Systeem</string>
+    <string name="settings_light_theme">Licht</string>
+    <string name="settings_dark_theme">Donker</string>
    <string name="settings_display_barcode_max_brightness">Scherm helderder maken bij tonen van barcode</string>
    <string name="intent_import_card_from_url_share_text">Ik wil een klantenkaart met je delen</string>
    <string name="all">Alles</string>
@@ -67,7 +69,7 @@
    <string name="exportSuccessful">De gegevens zijn geëxporteerd</string>
    <string name="groups">Groepen</string>
    <string name="enter_group_name">Voer een groepsnaam in</string>
-    <string name="starImage">Favorietster</string>
+    <string name="starImage">Favoriete ster</string>
    <string name="app_copyright_old">Gebaseerd op Klantenkaartkluis,
 \ncopyright ©2016–2020 Branden Archer</string>
    <string name="unstar">Verwijderen uit favorieten</string>
@@ -85,12 +87,14 @@
    </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>
@@ -124,6 +128,7 @@
    <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>
@@ -179,8 +184,10 @@
    <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>
@@ -203,7 +210,7 @@
    <string name="editGroup">Groep bewerken: <xliff:g>%s</xliff:g></string>
    <string name="noGiftCardsGroup">Voeg kaarten toe om ze hier te kunnen groeperen.</string>
    <string name="group_edit">Groep bewerken</string>
-    <string name="setIcon">Miniatuur instellen</string>
+    <string name="setIcon">Kies een pictogram</string>
    <string name="selectColor">Kies een kleur</string>
    <string name="action_show_details">Details tonen</string>
    <string name="action_hide_details">Details verbergen</string>
@@ -212,6 +219,8 @@
    <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>
@@ -259,28 +268,4 @@
    <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 miniatuur te bewerken</string>
-    <string name="show_balance">Saldo tonen</string>
-    <string name="show_name_below_image_thumbnail">Naam onder miniatuur tonen</string>
-    <string name="show_note">Aantekening tonen</string>
-    <string name="show_validity">Geldigheid tonen</string>
-    <string name="permissionReadCardsLabel">Catimakaarten uitlezen</string>
-    <string name="settings_allow_content_provider_read_summary">Let op: apps moeten nog steeds om toestemming vragen</string>
-    <string name="permissionReadCardsDescription">Lees alle kaarten uit, inclusief alle details, aantekeningen en afbeeldingen</string>
-    <string name="settings_allow_content_provider_read_title">Andere apps toegang geven tot gegevens</string>
-    <string name="settings_keep_screen_on_summary">Laat het scherm niet op zwart gaan tijdens het bekijken van een kaart</string>
-    <string name="settings_category_title_privacy">Privacy</string>
-    <string name="settings_display_barcode_max_brightness_summary">Benodigd voor de werking van sommige scanners</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">Schakelt schermvergrendeling uit tijdens het bekijken van een kaart</string>
-    <string name="settings_oled_dark_summary">Verlaagt het accuverbruik op oledschermen</string>
-    <string name="settings_category_title_cards">Kaarten</string>
-    <string name="settings_category_title_general">Algemeen</string>
 </resources>
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -49,8 +49,9 @@
        <item quantity="other"><xliff:g>%d</xliff:g> seleccionadas</item>
    </plurals>
    <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 n’importar una menú ⋮</string>
+    <string name="noGiftCards">Clicatz lo boton + per apondre una carta o utilizatz lo menú ⋮ per n’importar una.</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>
@@ -62,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>
+</resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -47,11 +47,13 @@
    <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>
    <string name="thumbnailDescription">Miniaturka</string>
    <string name="settings">Ustawienia</string>
+    <string name="settings_category_title_ui">Interfejs użytkownika</string>
    <string name="settings_theme">Motyw</string>
    <string name="settings_system_theme">Systemowy</string>
    <string name="settings_light_theme">Jasny</string>
@@ -138,11 +140,13 @@
    <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>
@@ -164,6 +168,7 @@
    <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>
@@ -190,19 +195,21 @@
    <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żywane</string>
+    <string name="sort_by_most_recently_used">Ostatnio użyte</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 miniaturę</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>
@@ -227,20 +234,22 @@
    </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">Archiwum</string>
-    <string name="unarchive">Cofnij archiwizację</string>
-    <string name="archived">Karta zarchiwizowana</string>
-    <string name="unarchived">Karta niezarchiwizowana</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="archiveList">Archiwum</string>
    <string name="noUnarchivedCardsMessage">Nie istnieją żadne niezarchiwizowane karty</string>
-    <string name="failedLaunchingPhotoPicker">Nie można odnaleźć aplikacji galeria</string>
+    <string name="failedLaunchingPhotoPicker">Nie można odnaleźć aplikacji galerii</string>
    <string name="previousCard">Poprzedni</string>
    <string name="nextCard">Następny</string>
    <plurals name="groupCardCountWithArchived">
@@ -273,16 +282,4 @@
    <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ć miniaturę</string>
-    <string name="show_name_below_image_thumbnail">Pokaż imię pod miniaturką zdjęcia</string>
-    <string name="show_balance">Pokaż balans</string>
-    <string name="show_validity">Pokaż ważność</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -57,10 +57,12 @@
    <string name="all">Todos</string>
    <string name="deleteConfirmationGroup">Eliminar o grupo\?</string>
    <string name="settings">Configurações</string>
+    <string name="settings_category_title_ui">Interface do utilizador</string>
    <string name="settings_theme">Tema</string>
    <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>
@@ -81,6 +83,7 @@
    <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>
@@ -121,6 +124,7 @@
 \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>
@@ -132,6 +136,7 @@
    <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>
@@ -172,9 +177,11 @@
    <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>
@@ -214,7 +221,9 @@
    <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>
@@ -266,12 +275,4 @@
    <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">Abrir a imagem frontal na aplicação da galeria</string>
-    <string name="openBackImageInGalleryApp">Abrir a imagem traseira na aplicação da galeria</string>
-    <string name="setBarcodeHeight">Definir altura do código de barras</string>
-    <string name="donate">Doar</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -43,6 +43,7 @@
    <string name="importOptionApplicationTitle">Utilizați o altă aplicație</string>
    <string name="starImage">Steaua preferată</string>
    <string name="settings">Setări</string>
+    <string name="settings_category_title_ui">Interfață utilizator</string>
    <string name="intent_import_card_from_url_share_text">Vreau să împărtășesc o carte cu tine</string>
    <string name="moveUp">Mutarea în sus</string>
    <string name="editCardTitle">Editare card</string>
@@ -56,6 +57,7 @@
    <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>
@@ -67,9 +69,11 @@
    <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>
@@ -102,4 +106,4 @@
    <string name="importCatima">Importați din Catima</string>
    <string name="importStocard">Importați din Stocard</string>
    <string name="intent_import_card_from_url_share_multiple_text">Aș dori să partajez niște carduri cu tine</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -49,11 +49,13 @@
    <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>
    <string name="thumbnailDescription">Логотип</string>
    <string name="settings">Настройки</string>
+    <string name="settings_category_title_ui">Внешний вид</string>
    <string name="settings_theme">Тема</string>
    <string name="settings_system_theme">Системная</string>
    <string name="settings_light_theme">Светлая</string>
@@ -90,11 +92,13 @@
    <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="never">Нет</string>
+    <string name="never">Никогда</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>
@@ -126,6 +130,7 @@
    <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>
@@ -187,9 +192,11 @@
    <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>
@@ -211,13 +218,15 @@
    <string name="group_edit">Изменить группу</string>
    <string name="group_name_already_in_use">Такое название группы уже существует</string>
    <string name="noGiftCardsGroup">Создайте несколько карт, а затем распределите их по группам здесь.</string>
-    <string name="setIcon">Выбор миниатюры</string>
+    <string name="setIcon">Выбор значка</string>
    <string name="selectColor">Выбрать цвет</string>
    <string name="action_hide_details">Скрыть детали</string>
    <string name="action_show_details">Показать детали</string>
    <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">
@@ -273,28 +282,4 @@
    <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>
-    <string name="show_note">Показывать примечание</string>
-    <string name="show_validity">Показывать срок действия</string>
-    <string name="show_name_below_image_thumbnail">Показывать название под миниатюрой</string>
-    <string name="show_balance">Показывать баланс</string>
-    <string name="permissionReadCardsDescription">Чтение ваших карт и всех их данных, включая заметки и изображения</string>
-    <string name="permissionReadCardsLabel">Чтение карт Catima</string>
-    <string name="settings_allow_content_provider_read_summary">Приложениям по-прежнему придётся запрашивать разрешение для получения доступа</string>
-    <string name="settings_allow_content_provider_read_title">Разрешать другим приложениям доступ к моим данным</string>
-    <string name="settings_category_title_privacy">Конфиденциальность</string>
-    <string name="settings_display_barcode_max_brightness_summary">Необходимо для работы некоторых сканеров</string>
-    <string name="settings_keep_screen_on_summary">Отключение функции автоотключения экрана при отображении карты</string>
-    <string name="settings_category_title_cards">Карты</string>
-    <string name="settings_category_title_general">Общие</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">Отключение функции блокировки экрана при отображении карты</string>
-    <string name="settings_oled_dark_summary">Снижение расхода заряда батареи на OLED-экранах</string>
 </resources>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -42,10 +42,12 @@
    <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 o 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 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>
    <string name="deleteTitle">Odstrániť kartu</string>
    <string name="deleteConfirmation">Naozaj chcete túto kartu odstrániť?</string>
@@ -61,6 +63,7 @@
    <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>
@@ -82,6 +85,7 @@
    <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á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>
@@ -136,6 +140,7 @@
    <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>
@@ -146,6 +151,7 @@
    <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>
@@ -176,6 +182,7 @@
 \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>
@@ -208,6 +215,7 @@
    <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="set_scale">Nastaviť mierku</string>
    <string name="duplicateCard">Duplikovať</string>
    <string name="archive">Archivovať</string>
    <string name="unarchive">Vrátiť z archivu</string>
@@ -248,6 +256,7 @@
        <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="swipeToSwitchImages">Potiahnutím prstom prepínate obrázky, podržaním otvoríte obrázok v aplikácii galéria</string>
    <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>
@@ -266,4 +275,4 @@
    <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>
+</resources>
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -42,10 +42,12 @@
    <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">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>
    <string name="deleteTitle">Odstrani kartico zvestobe</string>
    <string name="deleteConfirmation">Prosim potrdite, če želite izbrisati to kartico\?</string>
@@ -69,6 +71,7 @@
    <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 izbiro \"Ta kartica nima črtne kode\".</string>
+    <string name="settings_max_font_size_scale">Največja velikost pisave</string>
    <string name="settings_dark_theme">Temno</string>
    <string name="settings_light_theme">Svetlo</string>
    <string name="settings_system_theme">Sistem</string>
@@ -103,8 +106,10 @@
    <string name="settings_system_locale">Sistem</string>
    <string name="settings_locale">Jezik</string>
    <string name="barcodeImageDescriptionWithType">Slika <xliff:g>%s</xliff:g> črtna koda</string>
+    <string name="swipeToSwitchImages">Povlecite za zamenjavo slike ali dolgo pritisnite, da odprete sliko v aplikaciji za gledanje slik</string>
    <string name="sort_by">Razvrsti po</string>
    <string name="reverse">...v obratnem vrstnem redu</string>
+    <string name="sort_by_balance">Stanje</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>
@@ -154,6 +159,7 @@
    <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="set_scale">Nastavi velikost</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>
@@ -161,6 +167,7 @@
        <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="barcode">Črtna koda</string>
    <string name="editBarcode">Uredi črtno kodo</string>
    <string name="group_edit">Uredi skupino</string>
    <string name="never">Nikoli</string>
@@ -181,6 +188,7 @@
    <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="hideMoreInfo">Skrij informacije</string>
    <string name="updateBalance">Posodobi stanje</string>
    <string name="failedToRetrieveImageFile">Slikovne datoteke ni bilo mogoče pridobiti</string>
    <string name="credits">Zasluge</string>
@@ -210,6 +218,7 @@
    <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="moveBarcodeToCenterOfScreen">Postavi črtno kodo na sredino 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.
@@ -273,4 +282,4 @@
    <string name="validFromDate">Velja od</string>
    <string name="anyDate">Katerikoli datum</string>
    <string name="chooseValidFromDate">Izberite datum začetka veljavnosti</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -1,6 +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="settings_display_barcode_max_brightness">Gör streckkodsvyn ljusare</string>
+    <string name="settings_max_font_size_scale">Max. teckenstorlek</string>
    <string name="settings_keep_screen_on">Håll skärmen påslagen</string>
    <string name="enterBarcodeInstructions">Ange ID:t och välj antingen streckkodstyp nedan, eller \"Det finns ingen streckkod\".</string>
    <string name="importFidmeMessage">Välj den exporterade <i>fidme-export-request-xxxxxx.zip</i> från FidMe som du vill importera och välj streckkodstyper manuellt efteråt.
@@ -41,9 +42,11 @@
    <string name="addManually">Ange ID manuellt</string>
    <string name="addFromImage">Välj bild från galleriet</string>
    <string name="card">Kort</string>
+    <string name="barcode">Streckkod</string>
    <string name="editBarcode">Redigera streckkod</string>
    <string name="never">Aldrig</string>
    <string name="moveBarcodeToTopOfScreen">Flytta streckkoden högst upp på skärmen</string>
+    <string name="moveBarcodeToCenterOfScreen">Centrera streckkoden på skärmen</string>
    <string name="noBarcodeFound">Hittade ingen streckkod</string>
    <string name="points">Poäng</string>
    <string name="chooseImportType">Importera data från</string>
@@ -77,6 +80,7 @@
    <string name="settings_dark_theme">Mörkt</string>
    <string name="settings_light_theme">Ljust</string>
    <string name="settings_theme">Tema</string>
+    <string name="settings_category_title_ui">Användargränssnitt</string>
    <string name="settings">Inställningar</string>
    <string name="thumbnailDescription">Miniatyrbild</string>
    <string name="copy_to_clipboard_toast">ID:t kopierat till Urklipp</string>
@@ -142,6 +146,7 @@
    <string name="exportSuccessfulTitle">Exporten lyckades</string>
    <string name="scanCardBarcode">Skanna streckkod</string>
    <string name="settings_system_theme">Systemtemat</string>
+    <string name="app_revision_fmt">Ändringsinfo: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="privacy_policy_popup_text">Notis rörande integritetspolicy (krävs av vissa appbutiker):
 \n
 \nINGEN DATA ALLS SAMLAS IN, vilket vem som helst kan bekräfta eftersom vår app är fri programvara.</string>
@@ -179,8 +184,10 @@
    <string name="settings_theme_color">Temafärg</string>
    <string name="noGroupCards">Denna grupp är tom</string>
    <string name="barcodeImageDescriptionWithType">Bild <xliff:g>%s</xliff:g> streckkod</string>
+    <string name="swipeToSwitchImages">Svep eller ändra bilder, håll för att öppna i bild i galleri app</string>
    <string name="reverse">...i omvänd ordning</string>
    <string name="sort_by">Sortera efter</string>
+    <string name="sort_by_balance">Saldo</string>
    <string name="sort_by_expiry">Förfallodag</string>
    <string name="sort_by_most_recently_used">Senast använda</string>
    <string name="sort_by_name">Namn</string>
@@ -211,11 +218,13 @@
    <string name="shortcutSelectCard">Välj ett kort</string>
    <string name="showMoreInfo">Visa info</string>
    <string name="starred">Stjärnmärkt</string>
+    <string name="hideMoreInfo">Dölj info</string>
    <string name="options">Alternativ</string>
    <plurals name="balancePoints">
        <item quantity="one"><xliff:g>%s</xliff:g> poäng</item>
        <item quantity="other"><xliff:g>%s</xliff:g> poäng</item>
    </plurals>
+    <string name="set_scale">Justera skala</string>
    <string name="include_if_asking_support">Om du vill be om hjälp, inkludera då följande information:</string>
    <string name="settings_oled_dark">Helsvart bakgrund för mörkt tema</string>
    <string name="failedLaunchingPhotoPicker">Kunde inte hitta kompatibelt bildprogram</string>
@@ -259,4 +268,4 @@
    <string name="updateBalanceTitle">Hur mycket spenderade du\?</string>
    <string name="updateBalanceHint">Ange summa</string>
    <string name="newBalanceSentence">Ny balans: <xliff:g>%s</xliff:g></string>
-</resources>
+</resources>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,5 +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="swipeToSwitchImages">Resimler arasında geçiş yapmak için kaydırın, resmi galeri uygulamasında açmak için basılı tutun</string>
    <string name="app_contributors">Katkıda bulunanlar: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="settings_brown_theme">Kahverengi</string>
    <string name="settings_grey_theme">Gri</string>
@@ -63,11 +64,13 @@
    <string name="balance">Bakiye</string>
    <string name="errorReadingImage">Resim okunamadı</string>
    <string name="noBarcodeFound">Barkod bulunamadı</string>
+    <string name="moveBarcodeToCenterOfScreen">Barkodu ekranda ortala</string>
    <string name="moveBarcodeToTopOfScreen">Barkodu ekranın en üstüne taşı</string>
    <string name="chooseExpiryDate">Son kullanma tarihi seç</string>
    <string name="never">Hiçbir zaman</string>
    <string name="expiryDate">Son kullanma tarihi</string>
    <string name="editBarcode">Barkodu düzenle</string>
+    <string name="barcode">Barkod</string>
    <string name="card">Kart</string>
    <string name="balanceSentence">Bakiye: <xliff:g>%s</xliff:g></string>
    <string name="expiryStateSentenceExpired">Süresi doldu: <xliff:g>%s</xliff:g></string>
@@ -96,10 +99,12 @@
    <string name="settings_disable_lockscreen_while_viewing_card">Ekran kilidini engelle</string>
    <string name="settings_keep_screen_on">Ekranı açık tut</string>
    <string name="settings_display_barcode_max_brightness">Barkod görünümünü aydınlat</string>
+    <string name="settings_max_font_size_scale">Azami yazı tipi boyutu</string>
    <string name="settings_dark_theme">Koyu</string>
    <string name="settings_light_theme">Açık</string>
    <string name="settings_system_theme">Sistem</string>
    <string name="settings_theme">Tema</string>
+    <string name="settings_category_title_ui">Kullanıcı arayüzü</string>
    <string name="settings">Ayarlar</string>
    <string name="starImage">Sık kullanılan yıldız</string>
    <string name="thumbnailDescription">Küçük resim</string>
@@ -108,6 +113,7 @@
    <string name="selectBarcodeTitle">Barkod Seç</string>
    <string name="app_resources">Özgür üçüncü taraf kaynakları: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="app_libraries">Özgür üçüncü taraf kütüphaneleri: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_revision_fmt">Değişiklik Bilgileri: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="debug_version_fmt">Sürüm: <xliff:g id="version">%s</xliff:g></string>
    <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g> hakkında</string>
    <string name="app_license">GPLv3+ altında lisanslanan copyleft özgür yazılım</string>
@@ -181,6 +187,7 @@
    <string name="action_search">Ara</string>
    <string name="sort_by">Sıralama ölçütü</string>
    <string name="reverse">…ters sırada</string>
+    <string name="sort_by_balance">Bakiye</string>
    <string name="sort_by_expiry">Son kullanma tarihi</string>
    <string name="sort_by_most_recently_used">En Son Kullanılan</string>
    <string name="sort_by_name">Ad</string>
@@ -204,14 +211,16 @@
    <string name="group_name_is_empty">Grup adı boş olamaz</string>
    <string name="group_updated">Grup güncellendi</string>
    <string name="selectColor">Renk seç</string>
-    <string name="setIcon">Küçük resim ayarla</string>
+    <string name="setIcon">Simge ayarla</string>
    <string name="action_show_details">Ayrıntıları göster</string>
    <string name="action_hide_details">Ayrıntıları gizle</string>
    <string name="translate_platform">Weblate\'de</string>
    <string name="shortcutSelectCard">Kart seç</string>
    <string name="options">Seçenekler</string>
    <string name="showMoreInfo">Bilgileri göster</string>
+    <string name="hideMoreInfo">Bilgileri gizle</string>
    <string name="starred">Yıldızlı</string>
+    <string name="set_scale">Ölçeği ayarla</string>
    <plurals name="balancePoints">
        <item quantity="one"><xliff:g>%s</xliff:g> puan</item>
        <item quantity="other"><xliff:g>%s</xliff:g> puan</item>
@@ -259,28 +268,4 @@
    <string name="anyDate">Herhangi bir tarih</string>
    <string name="validFromDate">Geçerlilik başlangıcı</string>
    <string name="validFromSentence"><xliff:g>%s</xliff:g> tarihinden itibaren geçerlidir</string>
-    <string name="height">Yükseklik:</string>
-    <string name="switchToBackImage">Arka resme geç</string>
-    <string name="switchToBarcode">Barkoda geç</string>
-    <string name="donate">Bağış yap</string>
-    <string name="switchToFrontImage">Ön resme geç</string>
-    <string name="setBarcodeHeight">Barkod yüksekliğini ayarla</string>
-    <string name="openFrontImageInGalleryApp">Ön resmi galeri uygulamasında aç</string>
-    <string name="openBackImageInGalleryApp">Arka resmi galeri uygulamasında aç</string>
-    <string name="icon_header_click_text">Küçük resmi düzenlemek için uzun basın</string>
-    <string name="show_name_below_image_thumbnail">Küçük resmin altında adı göster</string>
-    <string name="show_note">Notu göster</string>
-    <string name="show_balance">Bakiyeyi göster</string>
-    <string name="show_validity">Geçerliliği göster</string>
-    <string name="permissionReadCardsLabel">Catima kartlarını oku</string>
-    <string name="permissionReadCardsDescription">Kartlarınızı ve tüm detaylarını, notlar ve resimler de dahil olmak üzere okuyun</string>
-    <string name="settings_keep_screen_on_summary">Ekran zaman aşımını bir kart görüntülerken devre dışı bırakır</string>
-    <string name="settings_allow_content_provider_read_title">Diğer uygulamaların verilerime erişmesine izin ver</string>
-    <string name="settings_display_barcode_max_brightness_summary">Bazı tarayıcıların çalışması için gereklidir</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">Ekran kilidini bir kart görüntülerken devre dışı bırakır</string>
-    <string name="settings_allow_content_provider_read_summary">Uygulamaların erişim izni almak için yine de izin istemesi gerekecek</string>
-    <string name="settings_category_title_general">Genel</string>
-    <string name="settings_category_title_privacy">Gizlilik</string>
-    <string name="settings_oled_dark_summary">OLED ekranlarda güç kullanımını düşürür</string>
-    <string name="settings_category_title_cards">Kartlar</string>
 </resources>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -40,7 +40,7 @@
    <string name="importCatima">Імпорт з Catima</string>
    <string name="accept">Прийняти</string>
    <string name="privacy_policy">Політика конфіденційності</string>
-    <string name="app_loyalty_card_keychain">Брелок для картки лояльності</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
    <string name="chooseImportType">Імпортувати дані з</string>
    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> здається, не є дійсним залишком.</string>
    <string name="points">Бали</string>
@@ -48,11 +48,13 @@
    <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>
@@ -75,10 +77,12 @@
    <string name="intent_import_card_from_url_share_text">Я хочу поділитися з тобою картою</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_dark_theme">Темна</string>
    <string name="settings_light_theme">Світла</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="starImage">Улюблена зірка</string>
    <string name="thumbnailDescription">Ескіз</string>
@@ -87,6 +91,7 @@
    <string name="copy_to_clipboard_toast">ID скопійовано до буферу обміну</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_license">Копілефт вільне програмне забезпечення, ліцензоване під GPLv3+</string>
@@ -187,8 +192,10 @@
    <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">Сортувати за</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>
@@ -212,7 +219,7 @@
    <string name="group_name_already_in_use">Група з такою назвою вже існує</string>
    <string name="noGiftCardsGroup">Створите кілька карток, та призначте їх до групи тут.</string>
    <string name="selectColor">Вибір кольору</string>
-    <string name="setIcon">Вибір мініатюри</string>
+    <string name="setIcon">Вибір іконки</string>
    <string name="action_show_details">Показати деталі</string>
    <string name="action_hide_details">Сховати деталі</string>
    <string name="translate_platform">на Weblate</string>
@@ -220,6 +227,8 @@
    <string name="options">Параметри</string>
    <string name="showMoreInfo">Відобразити дані</string>
    <string name="starred">Обране</string>
+    <string name="set_scale">Зміна масштабу</string>
+    <string name="hideMoreInfo">Сховати дані</string>
    <string name="settings_oled_dark">Повністю чорний фон для темної теми</string>
    <plurals name="balancePoints">
        <item quantity="one"><xliff:g>%s</xliff:g> бал</item>
@@ -273,17 +282,4 @@
    <string name="anyDate">Будь-яка дата</string>
    <string name="chooseValidFromDate">Виберіть термін дії з дати</string>
    <string name="validFromSentence">Дійсний від: <xliff:g>%s</xliff:g></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="height">Висота:</string>
-    <string name="donate">Пожертвувати</string>
-    <string name="icon_header_click_text">Тривале натискання для редагування мініатюри</string>
-    <string name="show_name_below_image_thumbnail">Показати назву під мініатюрою зображення</string>
-    <string name="show_note">Показати примітку</string>
-    <string name="show_validity">Показати термін дії</string>
-    <string name="show_balance">Показати баланс</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,19 +1,21 @@
 <?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_fmt">更新日志: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="groupsList">组：<xliff:g>%s</xliff:g></string>
    <plurals name="groupCardCount">
        <item quantity="other"><xliff:g>%d</xliff:g> 卡片</item>
    </plurals>
-    <string name="app_libraries">第三方自由程序库：<xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="debug_version_fmt">版本：<xliff:g id="version">%s</xliff:g></string>
+    <string name="app_libraries">第三方自由程序库: <xliff:g id="app_libraries_list">%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="barcode">条形码</string>
    <string name="card">卡片</string>
    <string name="addManually">手动输入卡号</string>
    <string name="settings_system_theme">系统设置</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">版权所有 © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
    <string name="importOptionApplicationButton">使用其他应用</string>
-    <string name="importOptionFilesystemButton">使用文件系统</string>
-    <string name="unstar">从收藏中移除</string>
+    <string name="importOptionFilesystemButton">从文件系统</string>
+    <string name="unstar">从收藏中删除</string>
    <string name="intent_import_card_from_url_share_multiple_text">我想和你分享一些卡片</string>
    <string name="copy_to_clipboard_multiple_toast">卡号已复制到剪贴板</string>
    <string name="wrongValueForBarcodeType">该值对所选条形码类型无效</string>
@@ -46,6 +48,7 @@
    <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>
@@ -71,38 +74,40 @@
    <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_theme">主题</string>
+    <string name="settings_category_title_ui">用户界面</string>
    <string name="settings">设置</string>
    <string name="thumbnailDescription">缩略图</string>
    <string name="copy_to_clipboard_toast">已复制卡号到剪贴板</string>
-    <string name="enterBarcodeInstructions">输入卡号，并从下面选择其条码类型，或选择“无条码”。</string>
+    <string name="enterBarcodeInstructions">输入卡号，并从下面选择其条码类型，或选择\"无条码\"。</string>
    <string name="selectBarcodeTitle">选择条码</string>
    <string name="app_resources">第三方自由资源：<xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="app_license">本软件为自由软件，使用 GPLv3+ 许可证</string>
    <string name="app_copyright_old">基于 Loyalty Card Keychain
-\nCopyright © 2016–2020 Branden Archer</string>
+\n版权所有 © 2016–2020 Branden Archer</string>
    <string name="about">关于</string>
    <string name="importOptionApplicationExplanation">使用任何应用程序或您喜欢的文件管理器打开文件。</string>
    <string name="importOptionApplicationTitle">使用其他应用</string>
-    <string name="importOptionFilesystemExplanation">请从文件系统选择文件。</string>
+    <string name="importOptionFilesystemExplanation">请从文件系统选择文件.</string>
    <string name="importOptionFilesystemTitle">从文件系统导入</string>
-    <string name="exportOptionExplanation">导出的数据将储存至你选择的位置。</string>
+    <string name="exportOptionExplanation">导出的数据将储存至你选择的位置.</string>
    <string name="cameraPermissionDeniedTitle">无法访问相机</string>
-    <string name="noCameraPermissionDirectToSystemSetting">Catima 需要访问您的相机来扫描条形码，轻触这里以更改您的权限设置。</string>
-    <string name="exporting">导出中……</string>
-    <string name="importing">导入中……</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Catima需要访问您的相机来扫描条形码. 轻触这里以更改您的权限设置。</string>
+    <string name="exporting">导出中…</string>
+    <string name="importing">导入中…</string>
    <string name="exportFailed">无法导出卡片</string>
    <string name="exportFailedTitle">导出失败</string>
    <string name="exportSuccessfulTitle">导出成功</string>
    <string name="importFailed">无法导入卡片</string>
    <string name="importFailedTitle">导入失败</string>
    <string name="importSuccessfulTitle">导入成功</string>
-    <string name="importExportHelp">备份你的数据以允许将其移动到另一个设备上。</string>
+    <string name="importExportHelp">备份数据允许你将其移动到另一个设备上。</string>
    <string name="exportName">导出</string>
    <string name="importExport">导入/导出</string>
-    <string name="failedParsingImportUriError">无法解析导入 URI</string>
+    <string name="failedParsingImportUriError">无法解析导入的URI</string>
    <string name="noCardExistsError">找不到卡片</string>
    <string name="noCardIdError">未输入卡号</string>
    <string name="noStoreError">未输入卡片名称</string>
@@ -112,7 +117,7 @@
    <string name="editCardTitle">编辑卡片</string>
    <string name="addCardTitle">添加卡片</string>
    <string name="scanCardBarcode">扫描条码</string>
-    <string name="sendLabel">发送……</string>
+    <string name="sendLabel">发送…</string>
    <string name="share">分享</string>
    <string name="copy_to_clipboard">复制卡号到剪贴板</string>
    <string name="ok">确定</string>
@@ -123,22 +128,22 @@
    <string name="cancel">取消</string>
    <string name="star">添加到收藏</string>
    <string name="noBarcode">无条形码</string>
-    <string name="barcodeNoBarcode">无可用条形码</string>
+    <string name="barcodeNoBarcode">无条形码</string>
    <string name="barcodeType">条形码类型</string>
    <string name="cardId">卡号</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="action_search">搜索</string>
-    <string name="deleteConfirmation">确定要永久删除此卡？</string>
+    <string name="deleteConfirmation">删除此卡？</string>
    <string name="deleteTitle">移除卡片</string>
-    <string name="starImage">收藏夹星星</string>
+    <string name="starImage">最喜欢的星星</string>
    <string name="importStocardMessage">选择 Stocard 导出文件 <i>****.zip</i>来导入。
 \n发电子邮件给 support@stocardapp.com 请求获得数据导出文件。</string>
    <plurals name="deleteCardsConfirmation">
-        <item quantity="other">确定要永久删除 <xliff:g>%d</xliff:g> 这些卡片？</item>
+        <item quantity="other">确定永久删除 <xliff:g>%d</xliff:g> 这些卡片？</item>
    </plurals>
    <plurals name="selectedCardCount">
        <item quantity="other">选中了 <xliff:g>%d</xliff:g> 张卡</item>
@@ -162,16 +167,17 @@
    <string name="backImageDescription">背面图像</string>
    <string name="frontImageDescription">正面图像</string>
    <string name="importStocard">从Stocard导入</string>
-    <string name="noGiftCardsGroup">创建一些卡片并分配到这个卡组中。</string>
+    <string name="noGiftCardsGroup">创建一些卡片，然后分配给这里的小组。</string>
    <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g>型条码图像</string>
    <string name="group_edit">编辑组</string>
    <plurals name="balancePoints">
        <item quantity="other"><xliff:g>%s</xliff:g> 点</item>
    </plurals>
    <string name="settings_locale">语言</string>
-    <string name="setIcon">设置缩略图</string>
+    <string name="setIcon">设置图标</string>
    <string name="settings_pink_theme">粉色</string>
    <string name="settings_oled_dark">纯黑色背景的深色主题</string>
+    <string name="hideMoreInfo">隐藏信息</string>
    <string name="translate_platform">在Weblate上</string>
    <string name="settings_sky_blue_theme">天蓝</string>
    <string name="showMoreInfo">显示信息</string>
@@ -193,6 +199,8 @@
    <string name="sort_by_most_recently_used">最近使用</string>
    <string name="sort_by_name">名称</string>
    <string name="help_translate_this_app">帮助翻译此应用</string>
+    <string name="sort_by_balance">余额</string>
+    <string name="swipeToSwitchImages">滑动切换图片，按住打开图库应用中的图片</string>
    <string name="reverse">倒序</string>
    <string name="sort_by">排序方式</string>
    <string name="selectColor">选择颜色</string>
@@ -210,6 +218,7 @@
    <string name="settings_violet_theme">紫色</string>
    <string name="action_show_details">显示详情</string>
    <string name="action_hide_details">隐藏详情</string>
+    <string name="set_scale">设置大小</string>
    <string name="app_contributors">因他们而存在: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="and_data_usage">和数据使用方法</string>
    <string name="failedLaunchingPhotoPicker">找不到支持的图库应用</string>
@@ -246,34 +255,10 @@
    <string name="failedToRetrieveImageFile">无法检索图像文件</string>
    <string name="newBalanceSentence">新余额：<xliff:g>%s</xliff:g></string>
    <string name="barcodeLongPressMessage">只能在图库应用程序中打开图像</string>
-    <string name="storageReadPermissionRequired">此操作所需的读取存储空间的权限……</string>
+    <string name="storageReadPermissionRequired">此操作所需的读取存储空间的权限…</string>
    <string name="validFromDate">有效期自</string>
    <string name="anyDate">任何日期</string>
    <string name="chooseValidFromDate">选择有效日期</string>
    <string name="validFromSentence">有效期自: <xliff:g>%s</xliff:g></string>
-    <string name="cameraPermissionRequired">此操作所需的访问相机的权限……</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>
-    <string name="show_note">显示备注</string>
-    <string name="show_balance">显示余额</string>
-    <string name="show_name_below_image_thumbnail">在图像缩略图下方显示名称</string>
-    <string name="show_validity">显示有效性</string>
-    <string name="permissionReadCardsLabel">读取 Catima 卡</string>
-    <string name="settings_allow_content_provider_read_summary">应用程序仍然需要请求权限</string>
-    <string name="settings_allow_content_provider_read_title">允许其他应用程序访问我的数据</string>
-    <string name="permissionReadCardsDescription">读取你的卡片及其所有细节，包括笔记和图像</string>
-    <string name="settings_keep_screen_on_summary">在查看卡片时禁止屏幕超时</string>
-    <string name="settings_oled_dark_summary">减少 OLED 显示屏上的电池使用量</string>
-    <string name="settings_category_title_privacy">隐私</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">查看卡片时禁用屏幕锁</string>
-    <string name="settings_display_barcode_max_brightness_summary">一些扫描仪工作所必需的</string>
-    <string name="settings_category_title_cards">卡包</string>
-    <string name="settings_category_title_general">常规</string>
+    <string name="cameraPermissionRequired">此操作所需的访问相机的权限…</string>
 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,5 +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="app_revision_url">https://github.com/CatimaLoyalty/Android/releases</string>
    <string name="action_search">搜尋</string>
    <string name="action_add">新增</string>
    <string name="noGiftCards">點選 + 按鈕以新增卡片，或從 ⋮ 選單中匯入。</string>
@@ -14,7 +15,7 @@
 \n
 \n我們並不會收集任何資料！任何人都可以檢視我們的原始碼並驗證這點。</string>
    <string name="star">新增至收藏</string>
-    <string name="app_license">公共版權（Copylefted）的自由軟體，許可 GPLv3+</string>
+    <string name="app_license">公共版權 (Copylefted) 的自由軟體，許可 GPLv3+</string>
    <string name="unstar">從收藏中移除</string>
    <string name="cancel">取消</string>
    <string name="save">儲存</string>
@@ -29,12 +30,13 @@
    <string name="addManually">手動輸入 ID</string>
    <string name="all">全部</string>
    <string name="balance">餘額</string>
-    <string name="balanceSentence">餘額：<xliff:g>%s</xliff:g></string>
+    <string name="balanceSentence">餘額: <xliff:g>%s</xliff:g></string>
    <string name="app_copyright_old">基於 Loyalty Card Keychain\n著作權所有 © 2016–2020 Branden Archer</string>
+    <string name="barcode">條碼</string>
    <string name="barcodeId">條碼內容</string>
    <string name="barcodeImageDescriptionWithType">圖片為 <xliff:g>%s</xliff:g> 的條碼</string>
    <string name="card">卡片</string>
-    <string name="card_ids_copied">已複製 ID</string>
+    <string name="card_ids_copied">已複製 ID(s)</string>
    <string name="cardShortcut">卡片捷徑</string>
    <string name="chooseExpiryDate">選擇逾期日期</string>
    <string name="chooseImportType">從地點匯入資料</string>
@@ -60,7 +62,7 @@
    <string name="exporting">匯出中…</string>
    <string name="exportName">匯出</string>
    <string name="exportOptionExplanation">資料將寫至您所選的位置。</string>
-    <string name="exportPassword">透過密碼保護您的匯出檔（選用）</string>
+    <string name="exportPassword">透過密碼保護您的匯出檔 (選用)</string>
    <string name="exportPasswordHint">輸入密碼</string>
    <string name="exportSuccessful">已匯出資料</string>
    <string name="exportSuccessfulTitle">已匯出</string>
@@ -70,14 +72,14 @@
    <string name="groups">群組</string>
    <string name="groupsList">群組：<xliff:g>%s</xliff:g></string>
    <string name="help_translate_this_app">幫助翻譯本程式</string>
-    <string name="importExport">匯入／匯出</string>
+    <string name="importExport">匯入/匯出</string>
    <string name="importFailedTitle">匯入失敗</string>
    <string name="importFailed">無法匯入資料</string>
    <string name="importing">匯入中…</string>
    <string name="importSuccessfulTitle">已匯入</string>
    <string name="intent_import_card_from_url_share_multiple_text">我想要分享些卡片給你</string>
    <string name="intent_import_card_from_url_share_text">我想要分享張卡片給你</string>
-    <string name="leaveWithoutSaveConfirmation">不儲存就離開？</string>
+    <string name="leaveWithoutSaveConfirmation">不保存就離開？</string>
    <string name="leaveWithoutSaveTitle">離開</string>
    <string name="license">許可</string>
    <string name="never">永不</string>
@@ -99,6 +101,7 @@
    <string name="sort_by_name">名稱</string>
    <string name="sort_by_most_recently_used">最近使用</string>
    <string name="sort_by_expiry">逾期日期</string>
+    <string name="sort_by_balance">餘額</string>
    <string name="reverse">...以反序排列</string>
    <string name="sort_by">排列方式</string>
    <string name="version_history">版本歷史</string>
@@ -123,7 +126,7 @@
    <string name="settings_locale">語言</string>
    <string name="settings_system_locale">系統語言</string>
    <string name="settings_theme_color">主題顏色</string>
-    <string name="app_contributors">感謝以下貢獻者：<xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="app_contributors">感謝以下貢獻者: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="privacy_policy">隱私權政策</string>
    <plurals name="selectedCardCount">
        <item quantity="other">已選取 <xliff:g>%d</xliff:g></item>
@@ -132,7 +135,7 @@
        <item quantity="other">刪除 <xliff:g>%d</xliff:g> 張卡片</item>
    </plurals>
    <plurals name="deleteCardsConfirmation">
-        <item quantity="other">永久刪除 <xliff:g>%d</xliff:g> 張卡片？</item>
+        <item quantity="other">永久刪除 <xliff:g>%d</xliff:g> 張卡片?</item>
    </plurals>
    <plurals name="groupCardCount">
        <item quantity="other"><xliff:g>%d</xliff:g> 張卡片</item>
@@ -143,6 +146,8 @@
    <string name="settings_theme">主題</string>
    <string name="thumbnailDescription">縮圖</string>
    <string name="noGroupCards">此群組為空</string>
+    <string name="settings_category_title_ui">用戶界面</string>
+    <string name="settings_max_font_size_scale">最大字體大小</string>
    <string name="settings_light_theme">淺色</string>
    <string name="settings_dark_theme">深色</string>
    <string name="settings_display_barcode_max_brightness">調高條碼介面螢幕亮度</string>
@@ -177,23 +182,27 @@
 \n請您先透過您的 FidMe 個人檔案選取『Data Protection』，並選擇『Extract my data』。</string>
    <string name="importCatima">自 Catima 匯入</string>
    <string name="importCatimaMessage">選取您自 Catima 匯出的 <i>catima.zip</i> 檔案以進行匯入。
-\n您可透過其他裝置的 Catima 程式中的匯入／匯出選單進行匯出。</string>
+\n您可透過其他裝置的 Catima 程式中的匯入/匯出選單進行匯出。</string>
    <string name="points">點</string>
    <string name="parsingBalanceFailed"><xliff:g>%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="app_libraries">第三方自由函示庫：<xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="app_resources">第三方自由資源：<xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="selectBarcodeTitle">選擇條碼</string>
    <string name="noGroups">請點選 + 加號按鈕新增群組。</string>
    <string name="moveBarcodeToTopOfScreen">將條碼移至螢幕上方</string>
+    <string name="moveBarcodeToCenterOfScreen">將條碼移至螢幕中央</string>
    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
    <string name="unsupportedBarcodeType">尚支援此條碼種類，但未來版本的應用程式可能會支援此條碼種類。</string>
    <string name="wrongValueForBarcodeType">條碼內容不適用於此條碼種類</string>
    <string name="backImageDescription">背面圖片</string>
    <string name="updateBarcodeQuestionText">您已更新了 ID，是否要更新條碼內容以匹配此 ID？</string>
    <string name="failedGeneratingShareURL">無法建立可分享的 URL，請回報此錯誤。</string>
+    <string name="swipeToSwitchImages">滑動切換圖片，長按檢視圖片</string>
    <string name="starImage">收藏標示</string>
    <string name="noGiftCardsGroup">建立一些卡片，然後將它們分配到這個群組中。</string>
    <string name="showMoreInfo">顯示資訊</string>
+    <string name="hideMoreInfo">隱藏資訊</string>
    <string name="action_show_details">顯示詳情</string>
    <string name="shortcutSelectCard">選擇卡片</string>
    <string name="starred">已收藏</string>
@@ -201,7 +210,7 @@
        <item quantity="other"><xliff:g>%s</xliff:g> 個點數</item>
    </plurals>
    <string name="selectColor">選擇顏色</string>
-    <string name="setIcon">設定縮圖</string>
+    <string name="setIcon">設定圖示</string>
    <string name="group_edit">編輯群組</string>
    <string name="group_name_already_in_use">此群組名稱已存在</string>
    <string name="group_name_is_empty">群組名稱不能為空</string>
@@ -211,6 +220,7 @@
    <string name="action_hide_details">隱藏詳情</string>
    <string name="translate_platform">於 Weblate</string>
    <string name="options">選項</string>
+    <string name="set_scale">設定大小</string>
    <string name="include_if_asking_support">如果您想請求協助，請附上以下訊息：</string>
    <string name="settings_card_orientation">條碼方向</string>
    <string name="failedToRetrieveImageFile">無法擷取圖片檔案</string>
@@ -234,7 +244,7 @@
    <string name="nextCard">下一張</string>
    <string name="welcome">歡迎使用 Catima</string>
    <plurals name="viewArchivedCardsWithCount">
-        <item quantity="other">檢視封存（<xliff:g>%1$d</xliff:g> 張卡片）</item>
+        <item quantity="other">檢視封存 (<xliff:g>%1$d</xliff:g> 張卡片)</item>
    </plurals>
    <string name="settings_lock_on_opening_orientation">開啟卡片時鎖定的方向</string>
    <string name="importCards">導入卡片</string>
@@ -242,26 +252,13 @@
    <string name="validFromDate">生效</string>
    <string name="anyDate">任何日期</string>
    <string name="chooseValidFromDate">選擇生效日期</string>
-    <string name="validFromSentence">生效日期：<xliff:g>%s</xliff:g></string>
+    <string name="validFromSentence">生效日期： <xliff:g>%s</xliff:g></string>
    <string name="storageReadPermissionRequired">這個行動需要閱讀儲存空間的權限…</string>
    <string name="cameraPermissionRequired">這個行動需要使用鏡頭的權限…</string>
    <string name="cameraPermissionDeniedTitle">不能使用鏡頭</string>
    <string name="updateBalance">更新餘額</string>
    <string name="updateBalanceTitle">你用了多少？</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="switchToBarcode">選擇條碼</string>
-    <string name="openFrontImageInGalleryApp">以圖庫軟件開啟正面圖片</string>
-    <string name="show_note">顯示備註</string>
-    <string name="show_balance">顯示餘額</string>
-    <string name="show_validity">顯示有效性</string>
-    <string name="switchToFrontImage">選擇正面圖片</string>
-    <string name="switchToBackImage">選擇背面圖片</string>
-    <string name="height">高度：</string>
-    <string name="donate">捐款</string>
-    <string name="icon_header_click_text">長按以編輯縮圖</string>
-    <string name="openBackImageInGalleryApp">以圖庫軟體開啟背面圖片</string>
-    <string name="show_name_below_image_thumbnail">在縮圖下方顯示名稱</string>
-    <string name="setBarcodeHeight">設定條碼高度</string>
-</resources>
+    <string name="currentBalanceSentence">餘額： <xliff:g>%s</xliff:g></string>
+    <string name="newBalanceSentence">新的餘額： <xliff:g>%s</xliff:g></string>
+</resources>
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -52,4 +52,6 @@
    <color name="md_theme_dark_inverseSurface">#ECDFDE</color>
    <color name="md_theme_dark_primaryInverse">#A83536</color>
    <color name="md_theme_dark_onSelected">#80201A1A</color>
+    <color name="seed">#B53F3F</color>
+    <color name="error">#BA1B1B</color>
 </resources>
--- a/app/src/main/res/values/constants.xml
+++ b/app/src/main/res/values/constants.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_revision_url" translatable="false">https://github.com/CatimaLoyalty/Android/releases</string>
+    <string name="app_webpage_url" translatable="false">https://github.com/CatimaLoyalty/Android</string>
+    <integer name="full_rotation_duration">100</integer>
+    <integer name="half_rotation_duration">50</integer>
+</resources>
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,4 +1,8 @@
 <resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
    <dimen name="no_data_textSize">16sp</dimen>
    <dimen name="no_data_padding">22dp</dimen>

@@ -10,13 +14,23 @@
    <dimen name="storeNameTextSize">28sp</dimen>
    <dimen name="noteTextSize">14sp</dimen>

+    <dimen name="singleCardCardIdTextSizeMin">15sp</dimen>
+    <dimen name="singleCardCardIdTextSizeMax">50sp</dimen>
+    <dimen name="singleCardNoteTextSizeMin">25sp</dimen>
+    <dimen name="singleCardNoteTextSizeMax">50sp</dimen>
+
+    <dimen name="inputBorderThickness">2dip</dimen>
+    <dimen name="inputBorderDividerThickness">4dip</dimen>
    <dimen name="inputMargin">2dip</dimen>
    <dimen name="inputPadding">10dip</dimen>
+    <dimen name="colorSamplePadding">10dip</dimen>
    <dimen name="inputSize">18sp</dimen>

    <dimen name="cardThumbnailSize">46dp</dimen>
+    <dimen name="cardThumbnailSizeLarge">200dp</dimen>
    <dimen name="cardThumbnailEditOverlaySize">21dp</dimen>

+    <dimen name="activity_margin_small">8dp</dimen>
    <dimen name="activity_margin">16dp</dimen>
    <!-- Padding for layouts-->
    <dimen name="activity_scanner_padding">10dp</dimen>
@@ -26,4 +40,5 @@
    <dimen name="tileLetterFontSize">66sp</dimen>
    <dimen name="tileLetterFontSizeForShortcut">48dp</dimen>
    <dimen name="tileLetterImageSize">92dp</dimen>
+    <dimen name="cardViewLetterFontSize">100sp</dimen>
 </resources>
--- a/app/src/main/res/values/settings.xml
+++ b/app/src/main/res/values/settings.xml
@@ -128,4 +128,11 @@
        <item>#2093cd</item>
        <item>#ad62a7</item>
    </array>
+
+    <!-- Default values -->
+    <integer name="settings_max_font_size_scale_pct">100</integer>
+
+    <!-- Constraints -->
+    <integer name="settings_max_font_size_scale_pct_min">50</integer>
+    <integer name="settings_max_font_size_scale_pct_max">200</integer>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -67,8 +67,6 @@
    <string name="exporting">Exporting…</string>
    <string name="storageReadPermissionRequired">Permission to read storage needed for this action…</string>
    <string name="cameraPermissionRequired">Permission to access camera needed for this action…</string>
-    <string name="permissionReadCardsLabel">Read Catima Cards</string>
-    <string name="permissionReadCardsDescription">Read your cards and all its details, including notes and images</string>
    <string name="cameraPermissionDeniedTitle">Could not access the camera</string>
    <string name="noCameraPermissionDirectToSystemSetting">To scan barcodes, Catima will need access to your camera. Tap here to change your permission settings.</string>
    <string name="exportOptionExplanation">The data will be written to a location of your choice.</string>
@@ -84,6 +82,7 @@
    <string name="app_license">Copylefted libre software, licensed GPLv3+</string>
    <string name="about_title_fmt">About <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">Revision Info: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries">Libre third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="app_resources">Libre third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="selectBarcodeTitle">Select Barcode</string>
@@ -92,6 +91,7 @@
    <string name="thumbnailDescription">Thumbnail</string>
    <string name="starImage">Favorite star</string>
    <string name="settings">Settings</string>
+    <string name="settings_category_title_ui">User interface</string>
    <string name="settings_theme">Theme</string>
    <string name="settings_key_theme" translatable="false">pref_theme</string>
    <string name="settings_system_theme">System</string>
@@ -111,18 +111,13 @@
    <string name="settings_lock_on_opening_orientation">Lock to orientation used when opening the card</string>
    <string name="settings_key_lock_on_opening_orientation" translatable="false">lock_on_opening</string>
    <string name="settings_key_max_font_size_scale" translatable="false">pref_max_font_size_scale</string>
+    <string name="settings_max_font_size_scale">Max. font size</string>
    <string name="settings_display_barcode_max_brightness">Brighten barcode view</string>
-    <string name="settings_display_barcode_max_brightness_summary">Necessary for some scanners to work</string>
    <string name="settings_key_display_barcode_max_brightness" translatable="false">pref_display_card_max_brightness</string>
    <string name="settings_keep_screen_on">Keep screen on</string>
-    <string name="settings_keep_screen_on_summary">Disables screen timeout while viewing a card</string>
    <string name="settings_key_keep_screen_on" translatable="false">pref_keep_screen_on</string>
    <string name="settings_disable_lockscreen_while_viewing_card">Prevent screen lock</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">Disables screen lock while viewing a card</string>
-    <string name="settings_allow_content_provider_read_title">Allow other apps to access my data</string>
-    <string name="settings_allow_content_provider_read_summary">Apps will still have to request permission to be granted access</string>
    <string name="settings_key_disable_lockscreen_while_viewing_card" translatable="false">pref_disable_lockscreen_while_viewing_card</string>
-    <string name="settings_key_allow_content_provider_read" translatable="false">pref_allow_content_provider_read</string>
    <string name="settings_key_oled_dark" translatable="false">pref_oled_dark</string>
    <string name="sharedpreference_active_tab" translatable="false">sharedpreference_active_tab</string>
    <string name="sharedpreference_privacy_policy_shown" translatable="false">sharedpreference_privacy_policy_shown</string>
@@ -130,6 +125,7 @@
    <string name="sharedpreference_sort_order" translatable="false">sharedpreference_sort_order</string>
    <string name="sharedpreference_sort_direction" translatable="false">sharedpreference_sort_direction</string>
    <string name="sharedpreference_card_details" translatable="false">sharedpreference_card_details</string>
+    <string name="sharedpreference_card_details_show" translatable="false">sharedpreference_card_details_show</string>
    <string name="intent_import_card_from_url_share_text">I want to share a card with you</string>
    <string name="intent_import_card_from_url_host_catima_app" translatable="false">catima.app</string>
    <string name="intent_import_card_from_url_path_prefix_catima_app" translatable="false">/share</string>
@@ -170,11 +166,13 @@
        <item quantity="other"><xliff:g>%s</xliff:g> points</item>
    </plurals>
    <string name="card">Card</string>
+    <string name="barcode">Barcode</string>
    <string name="editBarcode">Edit barcode</string>
    <string name="expiryDate">Expiry date</string>
    <string name="never">Never</string>
    <string name="chooseExpiryDate">Choose expiry date</string>
    <string name="moveBarcodeToTopOfScreen">Move the barcode to the top of the screen</string>
+    <string name="moveBarcodeToCenterOfScreen">Center the barcode on the screen</string>
    <string name="noBarcodeFound">No barcode was found</string>
    <string name="errorReadingImage">Could not read the image</string>
    <string name="balance">Balance</string>
@@ -227,11 +225,10 @@
    <string name="turn_flashlight_off">Turn flashlight off</string>
    <string name="settings_locale">Language</string>
    <string name="settings_oled_dark">Pure black background for dark theme</string>
-    <string name="settings_oled_dark_summary">Reduces battery usage on OLED displays</string>
    <string name="settings_key_locale" translatable="false">pref_locale</string>
    <string name="settings_system_locale">System</string>
    <string name="selectColor">Select color</string>
-    <string name="setIcon">Set thumbnail</string>
+    <string name="setIcon">Set icon</string>
    <string name="setting_key_theme_color" translatable="false">pref_theme_color</string>
    <string name="settings_theme_color">Theme color</string>
    <string name="settings_catima_theme">Catima</string>
@@ -255,12 +252,15 @@
    <string name="app_contributors">Made possible by: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="sort">Sort</string>
    <string name="showMoreInfo">Show info</string>
+    <string name="hideMoreInfo">Hide info</string>
    <string name="updateBalance">Update balance</string>
+    <string name="swipeToSwitchImages">Swipe to switch images, hold to open image in the gallery app</string>
    <string name="failedToRetrieveImageFile">Failed to retrieve image file</string>
    <string name="barcodeLongPressMessage">Only images can be opened in the gallery app</string>
    <string name="sort_by_name">Name</string>
    <string name="sort_by_most_recently_used">Most Recently Used</string>
    <string name="sort_by_expiry">Expiry</string>
+    <string name="sort_by_balance">Balance</string>
    <!-- \"Reversed order\" is also OK. This is an option in the card sorting list -->
    <string name="reverse">…in reversed order</string>
    <string name="sort_by">Sort by</string>
@@ -281,6 +281,7 @@
    <string name="shortcutSelectCard">Select a card</string>
    <string name="options">Options</string>
    <string name="starred">Starred</string>
+    <string name="set_scale">Set scale</string>
    <string name="include_if_asking_support">If you want to request support, include the following info:</string>
    <string name="duplicateCard">Duplicate</string>
    <string name="archive">Archive</string>
@@ -312,24 +313,4 @@
    <string name="anyDate">Any date</string>
    <string name="chooseValidFromDate">Choose valid from date</string>
    <string name="validFromSentence">Valid from: <xliff:g>%s</xliff:g></string>
-    <string name="height">Height:</string>
-    <string name="switchToFrontImage">Switch to front image</string>
-    <string name="switchToBackImage">Switch to back image</string>
-    <string name="switchToBarcode">Switch to barcode</string>
-    <string name="openFrontImageInGalleryApp">Open front image in gallery app</string>
-    <string name="openBackImageInGalleryApp">Open back image in gallery app</string>
-    <string name="setBarcodeHeight">Set barcode height</string>
-    <string name="donate">Donate</string>
-    <string name="icon_header_click_text">Long press to edit thumbnail</string>
-    <string name="show_name_below_image_thumbnail">Show name below image thumbnail</string>
-    <string name="show_note">Show note</string>
-    <string name="show_balance">Show balance</string>
-    <string name="show_validity">Show validity</string>
-    <string name="sharedpreference_card_details_show_note" translatable="false">sharedpreference_card_details_show_note</string>
-    <string name="sharedpreference_card_details_show_balance" translatable="false">sharedpreference_card_details_show_balance</string>
-    <string name="sharedpreference_card_details_show_validity" translatable="false">sharedpreference_card_details_show_validity</string>
-    <string name="sharedpreference_card_details_show_name_below_thumbnail" translatable="false">sharedpreference_card_details_show_name_below_thumbnail</string>
-    <string name="settings_category_title_cards">Cards</string>
-    <string name="settings_category_title_general">General</string>
-    <string name="settings_category_title_privacy">Privacy</string>
 </resources>
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -27,17 +27,8 @@
        <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
        <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
        <item name="colorPrimaryInverse">@color/md_theme_light_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>

    <style name="AppTheme.NoActionBar" parent="AppTheme">
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -3,7 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto">

    <PreferenceCategory
-        android:title="@string/settings_category_title_general"
+        android:title="@string/settings_category_title_ui"
        app:iconSpaceReserved="false">

        <ListPreference
@@ -13,8 +13,7 @@
            android:key="@string/settings_key_theme"
            android:title="@string/settings_theme"
            app:iconSpaceReserved="false"
-            app:singleLineTitle="false"
-            app:useSimpleSummaryProvider="true" />
+            app:singleLineTitle="false" />

        <ListPreference
            android:key="@string/setting_key_theme_color"
@@ -23,14 +22,11 @@
            android:entries="@array/color_value_strings"
            android:entryValues="@array/color_values"
            app:iconSpaceReserved="false"
-            app:singleLineTitle="false"
-            app:useSimpleSummaryProvider="true" />
+            app:singleLineTitle="false" />

        <SwitchPreferenceCompat
-            android:widgetLayout="@layout/preference_material_switch"
            android:defaultValue="false"
            android:key="@string/settings_key_oled_dark"
-            android:summary="@string/settings_oled_dark_summary"
            android:title="@string/settings_oled_dark"
            app:iconSpaceReserved="false"
            app:singleLineTitle="false" />
@@ -42,19 +38,22 @@
            android:key="@string/settings_key_locale"
            android:title="@string/settings_locale"
            app:iconSpaceReserved="false"
-            app:singleLineTitle="false"
-            app:useSimpleSummaryProvider="true" />
-    </PreferenceCategory>
+            app:singleLineTitle="false" />

-    <PreferenceCategory
-        android:title="@string/settings_category_title_cards"
-        app:iconSpaceReserved="false">
+        <nl.invissvenska.numberpickerpreference.NumberDialogPreference
+            android:key="@string/settings_key_max_font_size_scale"
+            android:title="@string/settings_max_font_size_scale"
+            app:defaultValue="@integer/settings_max_font_size_scale_pct"
+            app:iconSpaceReserved="false"
+            app:numberPickerPreference_maxValue="@integer/settings_max_font_size_scale_pct_max"
+            app:numberPickerPreference_minValue="@integer/settings_max_font_size_scale_pct_min"
+            app:numberPickerPreference_stepValue="10"
+            app:numberPickerPreference_unitText="%"
+            app:singleLineTitle="false" />

        <SwitchPreferenceCompat
-            android:widgetLayout="@layout/preference_material_switch"
            android:defaultValue="true"
            android:key="@string/settings_key_display_barcode_max_brightness"
-            android:summary="@string/settings_display_barcode_max_brightness_summary"
            android:title="@string/settings_display_barcode_max_brightness"
            app:iconSpaceReserved="false"
            app:singleLineTitle="false" />
@@ -66,41 +65,21 @@
            android:key="@string/settings_key_card_orientation"
            android:title="@string/settings_card_orientation"
            app:iconSpaceReserved="false"
-            app:singleLineTitle="false"
-            app:useSimpleSummaryProvider="true" />
+            app:singleLineTitle="false" />

        <SwitchPreferenceCompat
-            android:widgetLayout="@layout/preference_material_switch"
            android:defaultValue="true"
            android:key="@string/settings_key_keep_screen_on"
-            android:summary="@string/settings_keep_screen_on_summary"
            android:title="@string/settings_keep_screen_on"
            app:iconSpaceReserved="false"
            app:singleLineTitle="false" />

        <SwitchPreferenceCompat
-            android:widgetLayout="@layout/preference_material_switch"
            android:defaultValue="true"
            android:key="@string/settings_key_disable_lockscreen_while_viewing_card"
-            android:summary="@string/settings_disable_lockscreen_while_viewing_card_summary"
            android:title="@string/settings_disable_lockscreen_while_viewing_card"
            app:iconSpaceReserved="false"
            app:singleLineTitle="false" />
    </PreferenceCategory>

-    <PreferenceCategory
-        android:title="@string/settings_category_title_privacy"
-        app:iconSpaceReserved="false">
-
-        <SwitchPreferenceCompat
-            android:widgetLayout="@layout/preference_material_switch"
-            android:defaultValue="true"
-            android:key="@string/settings_key_allow_content_provider_read"
-            android:summary="@string/settings_allow_content_provider_read_summary"
-            android:title="@string/settings_allow_content_provider_read_title"
-            app:iconSpaceReserved="false"
-            app:singleLineTitle="false" />
-
-    </PreferenceCategory>
-</PreferenceScreen>
-
+</PreferenceScreen>
--- a/app/src/test/java/protect/card_locker/ImportExportTest.java
+++ b/app/src/test/java/protect/card_locker/ImportExportTest.java
@@ -67,6 +67,25 @@ public class ImportExportTest {
        mDatabase = TestHelpers.getEmptyDb(activity).getWritableDatabase();
    }

+    /**
+     * Add the given number of cards, each with
+     * an index in the store name.
+     *
+     * @param cardsToAdd
+     */
+    private void addLoyaltyCards(int cardsToAdd) {
+        // Add in reverse order to test sorting
+        for (int index = cardsToAdd; index > 0; index--) {
+            String storeName = String.format("store, \"%4d", index);
+            String note = String.format("note, \"%4d", index);
+            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, index, 0, null,0);
+            boolean result = (id != -1);
+            assertTrue(result);
+        }
+
+        assertEquals(cardsToAdd, DBHelper.getLoyaltyCardCount(mDatabase));
+    }
+
    private void addLoyaltyCardsFiveStarred() {
        int cardsToAdd = 9;
        // Add in reverse order to test sorting
@@ -164,6 +183,18 @@ public class ImportExportTest {
        assertEquals(4, DBHelper.getLoyaltyCardCount(mDatabase));
    }

+    private void addGroups(int groupsToAdd) {
+        // Add in reverse order to test sorting
+        for (int index = groupsToAdd; index > 0; index--) {
+            String groupName = String.format("group, \"%4d", index);
+            long id = DBHelper.insertGroup(mDatabase, groupName);
+            boolean result = (id != -1);
+            assertTrue(result);
+        }
+
+        assertEquals(groupsToAdd, DBHelper.getGroupCount(mDatabase));
+    }
+
    /**
     * Check that all of the cards follow the pattern
     * specified in addLoyaltyCards(), and are in sequential order
@@ -254,7 +285,7 @@ public class ImportExportTest {

    /**
     * Check that all of the groups follow the pattern
-     * specified in {@link TestHelpers#addGroups}, and are in sequential order
+     * specified in addGroups(), and are in sequential order
     * where the smallest group's index is 1
     */
    private void checkGroups() {
@@ -277,7 +308,7 @@ public class ImportExportTest {
    public void multipleCardsExportImport() throws IOException {
        final int NUM_CARDS = 10;

-        TestHelpers.addLoyaltyCards(mDatabase, NUM_CARDS);
+        addLoyaltyCards(NUM_CARDS);

        ByteArrayOutputStream outData = new ByteArrayOutputStream();
        OutputStreamWriter outStream = new OutputStreamWriter(outData);
@@ -307,7 +338,7 @@ public class ImportExportTest {
        final int NUM_CARDS = 10;
        List<char[]> passwords = Arrays.asList(null, "123456789".toCharArray());
        for (char[] password : passwords) {
-            TestHelpers.addLoyaltyCards(mDatabase, NUM_CARDS);
+            addLoyaltyCards(NUM_CARDS);

            ByteArrayOutputStream outData = new ByteArrayOutputStream();
            OutputStreamWriter outStream = new OutputStreamWriter(outData);
@@ -380,8 +411,8 @@ public class ImportExportTest {
        final int NUM_CARDS = 10;
        final int NUM_GROUPS = 3;

-        TestHelpers.addLoyaltyCards(mDatabase, NUM_CARDS);
-        TestHelpers.addGroups(mDatabase, NUM_GROUPS);
+        addLoyaltyCards(NUM_CARDS);
+        addGroups(NUM_GROUPS);

        List<Group> emptyGroup = new ArrayList<>();

@@ -453,7 +484,7 @@ public class ImportExportTest {
    public void importExistingCardsNotReplace() throws IOException {
        final int NUM_CARDS = 10;

-        TestHelpers.addLoyaltyCards(mDatabase, NUM_CARDS);
+        addLoyaltyCards(NUM_CARDS);

        ByteArrayOutputStream outData = new ByteArrayOutputStream();
        OutputStreamWriter outStream = new OutputStreamWriter(outData);
@@ -482,7 +513,7 @@ public class ImportExportTest {
        final int NUM_CARDS = 10;

        for (DataFormat format : DataFormat.values()) {
-            TestHelpers.addLoyaltyCards(mDatabase, NUM_CARDS);
+            addLoyaltyCards(NUM_CARDS);

            ByteArrayOutputStream outData = new ByteArrayOutputStream();
            OutputStreamWriter outStream = new OutputStreamWriter(outData);
@@ -527,7 +558,7 @@ public class ImportExportTest {
        final File sdcardDir = Environment.getExternalStorageDirectory();
        final File exportFile = new File(sdcardDir, "Catima.csv");

-        TestHelpers.addLoyaltyCards(mDatabase, NUM_CARDS);
+        addLoyaltyCards(NUM_CARDS);

        TestTaskCompleteListener listener = new TestTaskCompleteListener();

--- a/app/src/test/java/protect/card_locker/ImportURITest.java
+++ b/app/src/test/java/protect/card_locker/ImportURITest.java
@@ -97,37 +97,6 @@ public class ImportURITest {
        assertEquals(0, parsedCard.archiveStatus);
    }

-    @Test
-    public void parseWithTrailingSlash() throws InvalidObjectException, UnsupportedEncodingException {
-        // Generate card
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("EUR"), BarcodeFormat.UPC_A.toString(), null, CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), null, 0, null,0);
-
-        // Get card
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
-
-        // Card to URI, with a trailing slash
-        Uri cardUri = importURIHelper.toUri(card).buildUpon().path("/share/").build();
-        assertEquals("/share/", cardUri.getPath());
-
-        // Parse URI
-        LoyaltyCard parsedCard = importURIHelper.parse(cardUri);
-
-        // Compare everything
-        assertEquals(card.store, parsedCard.store);
-        assertEquals(card.note, parsedCard.note);
-        assertEquals(card.validFrom, parsedCard.validFrom);
-        assertEquals(card.expiry, parsedCard.expiry);
-        assertEquals(card.balance, parsedCard.balance);
-        assertEquals(card.balanceType, parsedCard.balanceType);
-        assertEquals(card.cardId, parsedCard.cardId);
-        assertEquals(card.barcodeId, parsedCard.barcodeId);
-        assertEquals(card.barcodeType.format(), parsedCard.barcodeType.format());
-        assertNull(parsedCard.headerColor);
-        // No export of starStatus for export URL foreseen therefore 0 will be imported
-        assertEquals(0, parsedCard.starStatus);
-        assertEquals(0, parsedCard.archiveStatus);
-    }
-
    @Test
    public void failToParseInvalidUri() {
        try {
--- a/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java
@@ -60,13 +60,25 @@ public class LoyaltyCardCursorAdapterTest {
        return viewHolder.itemView;
    }

-    private void checkView(final View view, final String store, final String note, final String validFrom, final String expiry, final String balance) {
-        final TextView storeField = view.findViewById(R.id.thumbnail_text);
+    private void checkView(final View view, final String store, final String note, final String validFrom, final String expiry, final String balance, boolean checkFontSizes) {
+        final TextView storeField = view.findViewById(R.id.store);
        final TextView noteField = view.findViewById(R.id.note);
        final TextView validFromField = view.findViewById(R.id.validFrom);
        final TextView expiryField = view.findViewById(R.id.expiry);
        final TextView balanceField = view.findViewById(R.id.balance);

+        if (checkFontSizes) {
+            Settings preferences = new Settings(activity.getApplicationContext());
+            int mediumFontSize = preferences.getFontSizeMax(preferences.getMediumFont());
+            int smallFontSize = preferences.getFontSizeMax(preferences.getSmallFont());
+
+            assertEquals(mediumFontSize, (int) storeField.getTextSize());
+            assertEquals(smallFontSize, (int) noteField.getTextSize());
+            assertEquals(smallFontSize, (int) validFromField.getTextSize());
+            assertEquals(smallFontSize, (int) expiryField.getTextSize());
+        }
+
+        assertEquals(store, storeField.getText().toString());
        if (!note.isEmpty()) {
            assertEquals(View.VISIBLE, noteField.getVisibility());
            assertEquals(note, noteField.getText().toString());
@@ -107,7 +119,7 @@ public class LoyaltyCardCursorAdapterTest {

        View view = createView(cursor);

-        checkView(view, card.store, card.note, "", "", "");
+        checkView(view, card.store, card.note, "", "", "", false);

        cursor.close();
    }
@@ -122,7 +134,30 @@ public class LoyaltyCardCursorAdapterTest {

        View view = createView(cursor);

-        checkView(view, card.store, card.note, "", "", "");
+        checkView(view, card.store, card.note, "", "", "", false);
+
+        cursor.close();
+    }
+
+    @Test
+    public void TestCursorAdapterFontSizes() {
+        Date date = new Date();
+        String dateString = DateFormat.getDateInstance(DateFormat.LONG).format(date);
+
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", date, date, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+
+        Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
+        cursor.moveToFirst();
+
+        setFontScale(50);
+        View view = createView(cursor);
+
+        checkView(view, card.store, card.note, dateString, dateString, "", true);
+
+        setFontScale(200);
+        view = createView(cursor);
+        checkView(view, card.store, card.note, dateString, dateString, "", true);

        cursor.close();
    }
@@ -188,7 +223,7 @@ public class LoyaltyCardCursorAdapterTest {

        View view = createView(cursor);

-        checkView(view, card.store, card.note, "", "", "");
+        checkView(view, card.store, card.note, "", "", "", false);

        cursor.close();
    }
@@ -203,7 +238,7 @@ public class LoyaltyCardCursorAdapterTest {

        View view = createView(cursor);

-        checkView(view, card.store, card.note, "", "", "");
+        checkView(view, card.store, card.note, "", "", "", false);

        cursor.close();
    }
@@ -218,7 +253,7 @@ public class LoyaltyCardCursorAdapterTest {

        View view = createView(cursor);

-        checkView(view, card.store, card.note, "", "", "100 points");
+        checkView(view, card.store, card.note, "", "", "100 points", false);

        cursor.close();
    }
@@ -233,7 +268,7 @@ public class LoyaltyCardCursorAdapterTest {

        View view = createView(cursor);

-        checkView(view, card.store, card.note, "", "", "$10.00");
+        checkView(view, card.store, card.note, "", "", "$10.00", false);

        cursor.close();
    }
--- a/Show More
+++ b/Show More