Release Catima 2.42.1

Merge pull request #3133 from CatimaLoyalty/create-pull-request/patch-1778936057
Update Fastlane changelogs
2026-09-08 12:21:49 -04:00 · 2026-05-16 15:00:12 +02:00 · 2026-05-16 14:54:42 +02:00 · 2026-05-16 12:54:16 +00:00 · 2026-05-16 14:54:02 +02:00 · 2026-05-16 14:53:14 +02:00
525 changed files with 2981 additions and 1306 deletions
@@ -24,7 +24,7 @@ permissions:
  security-events: none
  statuses: none
 env:
-  JAVA_HOME: /usr/lib/jvm/java-21-openjdk-amd64
+  JAVA_HOME: /usr/lib/jvm/java-25-openjdk-amd64
 jobs:
  build:
    runs-on: ubuntu-latest
@@ -34,26 +34,26 @@ jobs:
    steps:
      - uses: actions/checkout@v6
      - uses: gradle/actions/wrapper-validation@v5
-      - name: set up OpenJDK 21
+      - name: set up OpenJDK 25
        run: |
          sudo apt-get update
-          sudo apt-get install -y openjdk-21-jdk-headless
+          sudo apt-get install -y openjdk-25-jdk-headless
          sudo update-alternatives --auto java
      - name: Build
        run: ./gradlew assemble${{ matrix.flavor }}Release
      - name: Check lint
        run: ./gradlew lint${{ matrix.flavor }}Release
      - name: Run unit tests
-        run: timeout 5m ./gradlew test${{ matrix.flavor }}ReleaseUnitTest || { ./gradlew --stop && timeout 5m ./gradlew test${{ matrix.flavor }}ReleaseUnitTest; }
+        run: timeout 5m ./gradlew test${{ matrix.flavor }}DebugUnitTest || { ./gradlew --stop && timeout 5m ./gradlew test${{ matrix.flavor }}DebugUnitTest; }
      - name: Enable KVM
        run: |
          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
          sudo udevadm control --reload-rules
          sudo udevadm trigger --name-match=kvm
-      - name: Run instrumented tests (API 21)
+      - name: Run instrumented tests (API 23)
        uses: ReactiveCircus/android-emulator-runner@v2
        with:
-          api-level: 21
+          api-level: 23
          arch: x86_64
          script: ./gradlew connected${{ matrix.flavor }}DebugAndroidTest
      - name: Run instrumented tests (API 35)
@@ -64,7 +64,7 @@ jobs:
          script: ./gradlew connected${{ matrix.flavor }}DebugAndroidTest
      - name: Archive test results
        if: always()
-        uses: actions/upload-artifact@v6.0.0
+        uses: actions/upload-artifact@v7.0.1
        with:
          name: test-results-flavor${{ matrix.flavor }}
          path: app/build/reports
@@ -21,13 +21,13 @@ jobs:
      id: checkout
      uses: actions/checkout@v6
    - name: Setup Python
-      uses: actions/setup-python@v6.1.0
+      uses: actions/setup-python@v6.2.0
      with:
        python-version: '3.x'
    - name: Run converter script
      run: python .scripts/changelog_to_fastlane.py
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v8.0.0
+      uses: peter-evans/create-pull-request@v8.1.1
      with:
        title: "Update Fastlane changelogs"
        commit-message: "Update Fastlane changelogs"
@@ -24,8 +24,10 @@ jobs:
      with:
        file_in_repo: app/src/main/res/raw/contributors.txt
        min_commit_count: 5
+    - name: Remove gradle-update-robot from contributors (not a person)
+      run: "sed -i '/^gradle-update-robot$/d' app/src/main/res/raw/contributors.txt"
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v8.0.0
+      uses: peter-evans/create-pull-request@v8.1.1
      with:
        title: "Update contributors"
        commit-message: "Update contributors"
@@ -31,7 +31,7 @@ jobs:
    - name: Generate featureGraphic.png for each language
      run: .scripts/generate_feature_graphic/generate_feature_graphic.sh
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v8.0.0
+      uses: peter-evans/create-pull-request@v8.1.1
      with:
        title: "Update feature graphic"
        commit-message: "Update feature graphic"
@@ -1,20 +0,0 @@
-name: Update Gradle Wrapper
-
-on:
-  schedule:
-    - cron: "0 0 * * *"
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  update-gradle-wrapper:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-      - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@v2
@@ -23,7 +23,7 @@ jobs:
    - name: Update locales
      run: .scripts/locales.py
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v8.0.0
+      uses: peter-evans/create-pull-request@v8.1.1
      with:
        title: "Update locales"
        commit-message: "Update locales"
@@ -0,0 +1 @@
+3.3.11
@@ -1,5 +1,22 @@
 # Changelog

+## v2.42.1 - 166 (2026-05-16)
+
+- Prevent crash on devices with misbehaving NFC
+
+## v2.42.0 - 165 (2026-05-06)
+
+- Disable NFC while showing a card by default
+- Ask keyboard to capitalize each word in store name in edit screen
+- Put date in export file name
+
+## v2.41.7 - 164 (2026-03-06)
+
+Android 5.0 and 5.1 are no longer supported starting with this release. If you want to use Catima on these versions, please use version 2.41.6.
+
+- Fix crash when switching cards using volume buttons if only one card is available
+- Fix shortcut returning to previous card after rotation
+
 ## v2.41.6 - 163 (2026-01-23)

 - Auto-detect URLs in card ID and make the clickable in card ID details pop-up
@@ -1,8 +1,3 @@
 source "https://rubygems.org"

 gem "fastlane"
-
-# https://github.com/fastlane/fastlane/issues/29183
-gem "abbrev"
-gem "mutex_m"
-gem "ostruct"
@@ -1,40 +1,40 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.7)
-      base64
-      nkf
-      rexml
+    CFPropertyList (3.0.8)
    abbrev (0.1.2)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
    artifactory (3.0.17)
    atomos (0.1.3)
    aws-eventstream (1.4.0)
-    aws-partitions (1.1117.0)
-    aws-sdk-core (3.226.0)
+    aws-partitions (1.1246.0)
+    aws-sdk-core (3.246.0)
      aws-eventstream (~> 1, >= 1.3.0)
      aws-partitions (~> 1, >= 1.992.0)
      aws-sigv4 (~> 1.9)
      base64
+      bigdecimal
      jmespath (~> 1, >= 1.6.1)
      logger
-    aws-sdk-kms (1.105.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-kms (1.124.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.189.1)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-s3 (1.221.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.5)
    aws-sigv4 (1.12.1)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
    base64 (0.3.0)
+    bigdecimal (4.1.2)
    claide (1.1.0)
    colored (1.2)
    colored2 (3.1.2)
    commander (4.6.0)
      highline (~> 2.0.0)
+    csv (3.3.5)
    declarative (0.0.20)
    digest-crc (0.7.0)
      rake (>= 12.0.0, < 14.0.0)
@@ -42,7 +42,7 @@ GEM
    dotenv (2.8.1)
    emoji_regex (3.2.3)
    excon (0.112.0)
-    faraday (1.10.4)
+    faraday (1.10.5)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
@@ -54,25 +54,26 @@ GEM
      faraday-rack (~> 1.0)
      faraday-retry (~> 1.0)
      ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
+    faraday-cookie_jar (0.0.8)
      faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
+      http-cookie (>= 1.0.0)
    faraday-em_http (1.0.0)
    faraday-em_synchrony (1.0.1)
    faraday-excon (1.1.0)
    faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.1)
+    faraday-multipart (1.2.0)
      multipart-post (~> 2.0)
    faraday-net_http (1.0.2)
    faraday-net_http_persistent (1.2.0)
    faraday-patron (1.0.0)
    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
+    faraday-retry (1.0.4)
    faraday_middleware (1.2.1)
      faraday (~> 1.0)
-    fastimage (2.4.0)
-    fastlane (2.228.0)
+    fastimage (2.4.1)
+    fastlane (2.229.0)
      CFPropertyList (>= 2.3, < 4.0.0)
+      abbrev (~> 0.1.2)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
      aws-sdk-s3 (~> 1.0)
@@ -80,6 +81,7 @@ GEM
      bundler (>= 1.12.0, < 3.0.0)
      colored (~> 1.2)
      commander (~> 4.6)
+      csv (~> 3.3)
      dotenv (>= 2.1.1, < 3.0.0)
      emoji_regex (>= 0.1, < 4.0)
      excon (>= 0.71.0, < 1.0.0)
@@ -99,6 +101,7 @@ GEM
      jwt (>= 2.1.0, < 3)
      mini_magick (>= 4.9.4, < 5.0.0)
      multipart-post (>= 2.0.0, < 3.0.0)
+      mutex_m (~> 0.3.0)
      naturally (~> 2.2)
      optparse (>= 0.1.1, < 1.0.0)
      plist (>= 3.1.0, < 4.0.0)
@@ -113,8 +116,7 @@ GEM
      xcodeproj (>= 1.13.0, < 2.0.0)
      xcpretty (~> 0.4.1)
      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-sirp (1.0.0)
-      sysrandom (~> 1.0)
+    fastlane-sirp (1.1.0)
    gh_inspector (1.1.3)
    google-apis-androidpublisher_v3 (0.54.0)
      google-apis-core (>= 0.11.0, < 2.a)
@@ -137,7 +139,7 @@ GEM
      google-cloud-errors (~> 1.0)
    google-cloud-env (1.6.0)
      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.5.0)
+    google-cloud-errors (1.6.0)
    google-cloud-storage (1.47.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
@@ -158,43 +160,40 @@ GEM
    httpclient (2.9.0)
      mutex_m
    jmespath (1.6.2)
-    json (2.12.2)
-    jwt (2.10.1)
+    json (2.19.5)
+    jwt (2.10.2)
      base64
    logger (1.7.0)
    mini_magick (4.13.2)
    mini_mime (1.1.5)
-    multi_json (1.15.0)
+    multi_json (1.21.1)
    multipart-post (2.4.1)
    mutex_m (0.3.0)
    nanaimo (0.4.0)
    naturally (2.3.0)
-    nkf (0.2.0)
-    optparse (0.6.0)
+    optparse (0.8.1)
    os (1.1.4)
-    ostruct (0.6.1)
    plist (3.7.2)
-    public_suffix (6.0.2)
-    rake (13.3.0)
+    public_suffix (7.0.5)
+    rake (13.4.2)
    representable (3.2.0)
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
-    retriable (3.1.2)
-    rexml (3.4.1)
+    retriable (3.4.1)
+    rexml (3.4.4)
    rouge (3.28.0)
    ruby2_keywords (0.0.5)
    rubyzip (2.4.1)
    security (0.1.5)
-    signet (0.20.0)
+    signet (0.21.0)
      addressable (~> 2.8)
      faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
      multi_json (~> 1.10)
    simctl (1.6.10)
      CFPropertyList
      naturally
-    sysrandom (1.0.5)
    terminal-notifier (2.0.0)
    terminal-table (3.0.2)
      unicode-display_width (>= 1.1.1, < 3)
@@ -222,10 +221,7 @@ PLATFORMS
  ruby

 DEPENDENCIES
-  abbrev
  fastlane
-  mutex_m
-  ostruct

 BUNDLED WITH
   2.5.22
@@ -1,5 +1,5 @@
 **Last updated**  
-September 30 2025
+April 29 2026

 # Privacy Policy
 Catima does not collect or transmit any personal information.
@@ -7,6 +7,7 @@ Catima does not collect or transmit any personal information.
 To ensure correct app functionality, we require access to the following:

 - Camera: We need access to your camera to be able to scan barcodes. The app can still be used when camera access is denied, but you will have to manually type the barcode information.
+- NFC: We need NFC access to temporarily disable NFC while showing a barcode to prevent NFC payment apps from triggering (such as when using a check-in gates which support both barcodes and NFC payments). This functionality can be disabled in settings.
 - Storage (Android 5 and 6 only): We need access to your device storage to create or import backups. The app can still be used when storage access is denied, but you will not be able to create or import backups.

 Catima offers a feature to share cards with other users. All the relevant data is in the generated shareable URLs and never transmitted to our servers. When viewed through catima.app, the data in the URL is rendered using client-side Javascript to further ensure no data is ever transmitted to us.
@@ -17,10 +17,10 @@ android {

    defaultConfig {
        applicationId = "me.hackerchick.catima"
-        minSdk = 21
+        minSdk = 23
        targetSdk = 36
-        versionCode = 163
-        versionName = "2.41.6"
+        versionCode = 166
+        versionName = "2.42.1"

        vectorDrawables.useSupportLibrary = true
        multiDexEnabled = true
@@ -38,7 +38,7 @@ android {
        release {
            isMinifyEnabled = true
            proguardFiles(
-                getDefaultProguardFile("proguard-android.txt"),
+                getDefaultProguardFile("proguard-android-optimize.txt"),
                "proguard-rules.pro"
            )
        }
@@ -98,7 +98,7 @@ android {

    kotlin {
        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
+            jvmTarget = JvmTarget.JVM_21
        }
    }
    compileOptions {
@@ -107,9 +107,8 @@ android {
        // Flag to enable support for the new language APIs
        isCoreLibraryDesugaringEnabled = true

-
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
    }
 }

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Catima Debug</string>
-</resources>
+    <string name="app_name">Debug di Catima</string>
+</resources>
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Depuração do Catima</string>
+</resources>
@@ -12,8 +12,12 @@
    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />

    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.NFC" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="23" />

+    <uses-feature
+        android:name="android.hardware.nfc"
+        android:required="false" />
    <uses-feature
        android:name="android.hardware.camera"
        android:required="false" />
@@ -94,7 +98,7 @@
            android:theme="@style/AppTheme.NoActionBar"
            android:windowSoftInputMode="adjustResize"/>
        <activity
-            android:name=".LoyaltyCardViewActivity"
+            android:name=".cardview.LoyaltyCardViewActivity"
            android:exported="true"
            android:theme="@style/AppTheme.NoActionBar" />
        <activity
@@ -57,7 +57,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
    private final boolean showFallback;
    private final BarcodeImageWriterResultCallback callback;

-    BarcodeImageWriterTask(
+    public BarcodeImageWriterTask(
            Context context, ImageView imageView, String cardIdString,
            CatimaBarcode barcodeFormat, @NonNull Charset barcodeEncoding, TextView textView,
            boolean showFallback, BarcodeImageWriterResultCallback callback, boolean roundCornerPadding, boolean isFullscreen
@@ -22,6 +22,8 @@ import java.util.List;
 import java.util.concurrent.Flow;
 import java.util.function.Consumer;

+import protect.card_locker.cardview.LoyaltyCardViewActivity;
+
@RequiresApi(Build.VERSION_CODES.R)
 public class CardsOnPowerScreenService extends ControlsProviderService {

@@ -38,15 +38,10 @@ public class CatimaAppCompatActivity extends AppCompatActivity {
        Window window = getWindow();
        if (window != null) {
            boolean darkMode = Utils.isDarkModeEnabled(this);
-            if (Build.VERSION.SDK_INT >= 23) {
-                View decorView = window.getDecorView();
-                WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(window, decorView);
-                wic.setAppearanceLightStatusBars(!darkMode);
-                window.setStatusBarColor(Color.TRANSPARENT);
-            } else {
-                // icons are always white back then
-                window.setStatusBarColor(darkMode ? Color.TRANSPARENT : Color.argb(127, 0, 0, 0));
-            }
+            View decorView = window.getDecorView();
+            WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(window, decorView);
+            wic.setAppearanceLightStatusBars(!darkMode);
+            window.setStatusBarColor(Color.TRANSPARENT);
        }
        // XXX android 9 and below has a nasty rendering bug if the theme was patched earlier
        Utils.postPatchColors(this);
@@ -66,7 +61,4 @@ public class CatimaAppCompatActivity extends AppCompatActivity {
            actionBar.setDisplayHomeAsUpEnabled(true);
        }
    }
-
-    public void onMockedRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-    }
 }
@@ -27,6 +27,9 @@ import protect.card_locker.importexport.ImportExportResultType
 import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale

 class ImportExportActivity : CatimaAppCompatActivity() {
    private lateinit var binding: ImportExportActivityBinding
@@ -45,6 +48,11 @@ class ImportExportActivity : CatimaAppCompatActivity() {

    companion object {
        private const val TAG = "Catima"
+
+        internal fun getExportFilename(): String {
+            val sdf = SimpleDateFormat("yyyyMMdd", Locale.US)
+            return "catima_${sdf.format(Date())}.zip"
+        }
    }

    override fun onCreate(savedInstanceState: Bundle?) {
@@ -107,7 +115,7 @@ class ImportExportActivity : CatimaAppCompatActivity() {
        val intentCreateDocumentAction = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
            addCategory(Intent.CATEGORY_OPENABLE)
            type = "application/zip"
-            putExtra(Intent.EXTRA_TITLE, "catima.zip")
+            putExtra(Intent.EXTRA_TITLE, getExportFilename())
        }

        val exportButton: Button = binding.exportButton
@@ -13,6 +13,7 @@ import android.view.View
 import android.widget.RemoteViews
 import androidx.core.widget.RemoteViewsCompat
 import protect.card_locker.DBHelper.LoyaltyCardArchiveFilter
+import protect.card_locker.cardview.LoyaltyCardViewActivity

 class ListWidget : AppWidgetProvider() {
    fun updateAll(context: Context) {
@@ -102,8 +103,7 @@ class ListWidget : AppWidgetProvider() {
            val foreground = if (Utils.needsDarkForeground(headerColor)) Color.BLACK else Color.WHITE
            setInt(R.id.item_container_foreground, "setBackgroundColor", headerColor)
            val icon = loyaltyCard.getImageThumbnail(context)
-            // setImageViewIcon is not supported on Android 5, so force Android 5 down the text path
-            // FIXME: The icon flow causes a crash up to Android 12L, so SDK_INT is forced up from 23 to 33
+            // FIXME: The icon flow causes a crash up to Android 12L, so force anything below 33 down this path
            if (icon != null && Build.VERSION.SDK_INT >= 32) {
                setInt(R.id.item_container_foreground, "setBackgroundColor", foreground)
                setImageViewIcon(R.id.item_image, Icon.createWithBitmap(icon))
@@ -130,4 +130,4 @@ class ListWidget : AppWidgetProvider() {

        return remoteViews
    }
-}
+}
@@ -719,6 +719,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        });
    }

+    @Override
+    protected void onDestroy() {
+        if (mDatabase != null && mDatabase.isOpen()) {
+            mDatabase.close();
+        }
+        super.onDestroy();
+    }
+
    private void selectTab(int index) {
        binding.tabs.selectTab(binding.tabs.getTabAt(index));
        viewModel.setTabIndex(index);
@@ -31,6 +31,7 @@ import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
 import protect.card_locker.DBHelper.LoyaltyCardOrder
 import protect.card_locker.DBHelper.LoyaltyCardOrderDirection
 import protect.card_locker.LoyaltyCardCursorAdapter.CardAdapterListener
+import protect.card_locker.cardview.LoyaltyCardViewActivity
 import protect.card_locker.databinding.ContentMainBinding
 import protect.card_locker.databinding.MainActivityBinding
 import protect.card_locker.databinding.SortingOptionBinding
@@ -34,11 +34,6 @@ public class PermissionUtils {
     * @return
     */
    public static boolean needsCameraPermission(Activity activity) {
-        // Android only introduced the runtime permission system in Marshmallow (Android 6.0)
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            return false;
-        }
-
        return ContextCompat.checkSelfPermission(activity, android.Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED;
    }

@@ -49,21 +44,14 @@ public class PermissionUtils {
     * @param activity
     * @param requestCode
     */
-    public static void requestStorageReadPermission(CatimaAppCompatActivity activity, int requestCode) {
+    public static void requestStorageReadPermission(Activity activity, int requestCode) {
        String[] permissions = new String[]{ android.Manifest.permission.READ_EXTERNAL_STORAGE };
        int[] mockedResults = new int[]{ PackageManager.PERMISSION_GRANTED };

        if (needsStorageReadPermission(activity)) {
            ActivityCompat.requestPermissions(activity, permissions, requestCode);
        } else {
-            // FIXME: This points to onMockedRequestPermissionResult instead of to
-            // onRequestPermissionResult because onRequestPermissionResult was only introduced in
-            // Android 6.0 (SDK 23) and we and to support Android 5.0 (SDK 21) too.
-            //
-            // When minSdk becomes 23, this should point to onRequestPermissionResult directly and
-            // the activity input variable should be changed from CatimaAppCompatActivity to
-            // Activity.
-            activity.onMockedRequestPermissionsResult(requestCode, permissions, mockedResults);
+            activity.onRequestPermissionsResult(requestCode, permissions, mockedResults);
        }
    }

@@ -74,21 +62,14 @@ public class PermissionUtils {
     * @param activity
     * @param requestCode
     */
-    public static void requestCameraPermission(CatimaAppCompatActivity activity, int requestCode) {
+    public static void requestCameraPermission(Activity activity, int requestCode) {
        String[] permissions = new String[]{ Manifest.permission.CAMERA };
        int[] mockedResults = new int[]{ PackageManager.PERMISSION_GRANTED };

        if (needsCameraPermission(activity)) {
            ActivityCompat.requestPermissions(activity, permissions, requestCode);
        } else {
-            // FIXME: This points to onMockedRequestPermissionResult instead of to
-            // onRequestPermissionResult because onRequestPermissionResult was only introduced in
-            // Android 6.0 (SDK 23) and we and to support Android 5.0 (SDK 21) too.
-            //
-            // When minSdk becomes 23, this should point to onRequestPermissionResult directly and
-            // the activity input variable should be changed from CatimaAppCompatActivity to
-            // Activity.
-            activity.onMockedRequestPermissionsResult(requestCode, permissions, mockedResults);
+            activity.onRequestPermissionsResult(requestCode, permissions, mockedResults);
        }
    }
 }
@@ -543,14 +543,6 @@ class ScanActivity : CatimaAppCompatActivity() {
    ) {
        super.onRequestPermissionsResult(requestCode, permissions, grantResults)

-        onMockedRequestPermissionsResult(requestCode, permissions, grantResults)
-    }
-
-    override fun onMockedRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<String>,
-        grantResults: IntArray
-    ) {
        val granted =
            grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED

@@ -15,11 +15,11 @@ import androidx.core.content.pm.ShortcutManagerCompat;
 import androidx.core.graphics.drawable.IconCompat;

 import org.jetbrains.annotations.NotNull;
-
-import java.util.Collections;
 import java.util.LinkedList;

-class ShortcutHelper {
+import protect.card_locker.cardview.LoyaltyCardViewActivity;
+
+public class ShortcutHelper {
    /**
     * This variable controls the maximum number of shortcuts available.
     * It is made public only to make testing easier and should not be
@@ -43,33 +43,36 @@ class ShortcutHelper {
     * based on the lastUsed field. Archived cards are excluded from the shortcuts
     * list. The list keeps at most maxShortcuts number of elements.
     */
-    static void updateShortcuts(Context context) {
+    public static void updateShortcuts(Context context) {
        if (maxShortcuts == -1) {
            maxShortcuts = ShortcutManagerCompat.getMaxShortcutCountPerActivity(context);
        }
        LinkedList<ShortcutInfoCompat> finalList = new LinkedList<>();
-        SQLiteDatabase database = new DBHelper(context).getReadableDatabase();
-        Cursor loyaltyCardCursor = DBHelper.getLoyaltyCardCursor(
+        DBHelper dbHelper = new DBHelper(context);
+        SQLiteDatabase database = dbHelper.getReadableDatabase();
+        try (Cursor loyaltyCardCursor = DBHelper.getLoyaltyCardCursor(
                database,
                "",
                null,
                DBHelper.LoyaltyCardOrder.LastUsed,
                DBHelper.LoyaltyCardOrderDirection.Ascending,
                DBHelper.LoyaltyCardArchiveFilter.Unarchived
-        );
+        )) {
+            int rank = 0;

-        int rank = 0;
+            while (rank < maxShortcuts && loyaltyCardCursor.moveToNext()) {
+                int id = loyaltyCardCursor.getInt(loyaltyCardCursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
+                LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(context, database, id);

-        while (rank < maxShortcuts && loyaltyCardCursor.moveToNext()) {
-            int id = loyaltyCardCursor.getInt(loyaltyCardCursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
-            LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(context, database, id);
+                ShortcutInfoCompat updatedShortcut = createShortcutBuilder(context, loyaltyCard)
+                        .setRank(rank)
+                        .build();

-            ShortcutInfoCompat updatedShortcut = createShortcutBuilder(context, loyaltyCard)
-                    .setRank(rank)
-                    .build();
-
-            finalList.addLast(updatedShortcut);
-            rank++;
+                finalList.addLast(updatedShortcut);
+                rank++;
+            }
+        } finally {
+            dbHelper.close();
        }

        ShortcutManagerCompat.setDynamicShortcuts(context, finalList);
@@ -90,7 +93,7 @@ class ShortcutHelper {
        intent.setAction(Intent.ACTION_MAIN);
        // Prevent instances of the view activity from piling up; if one exists let this
        // one replace it.
-        intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
        final Bundle bundle = new Bundle();
        bundle.putInt(LoyaltyCardViewActivity.BUNDLE_ID, loyaltyCard.id);
        intent.putExtras(bundle);
@@ -110,4 +113,4 @@ class ShortcutHelper {
                .setIntent(intent)
                .setIcon(icon);
    }
-}
+}
@@ -40,16 +40,9 @@ class UCropWrapper : UCropActivity() {
            return
        }

-        if (Build.VERSION.SDK_INT >= 23) {
-            val decorView = window.decorView
-            val wic = WindowInsetsControllerCompat(window, decorView)
-            wic.isAppearanceLightStatusBars = !darkMode
-        } else if (!darkMode) {
-            window.statusBarColor = ColorUtils.compositeColors(
-                Color.argb(127, 0, 0, 0),
-                window.statusBarColor
-            )
-        }
+        val decorView = window.decorView
+        val wic = WindowInsetsControllerCompat(window, decorView)
+        wic.isAppearanceLightStatusBars = !darkMode
    }

    private fun checkViews(darkMode: Boolean) {
@@ -0,0 +1,103 @@
+package protect.card_locker.cardview;
+
+import java.util.ArrayList;
+import java.util.List;
+
+final class LoyaltyCardImageNavigator {
+    private final List<LoyaltyCardImageType> imageTypes;
+    private int currentIndex;
+
+    LoyaltyCardImageNavigator(List<LoyaltyCardImageType> imageTypes, int currentIndex) {
+        this.imageTypes = new ArrayList<>(imageTypes);
+        this.currentIndex = clampIndex(currentIndex);
+    }
+
+    LoyaltyCardImageType getCurrent() {
+        if (isEmpty()) {
+            return LoyaltyCardImageType.NONE;
+        }
+        return imageTypes.get(currentIndex);
+    }
+
+    boolean isEmpty() {
+        return imageTypes.isEmpty();
+    }
+
+    int size() {
+        return imageTypes.size();
+    }
+
+    boolean remove(LoyaltyCardImageType type) {
+        int removedIndex = imageTypes.indexOf(type);
+        if (removedIndex == -1) {
+            return false;
+        }
+
+        imageTypes.remove(removedIndex);
+        currentIndex = clampIndex(currentIndex);
+        return true;
+    }
+
+    boolean canGoPrevious() {
+        return currentIndex > 0;
+    }
+
+    boolean canGoNext() {
+        return currentIndex < imageTypes.size() - 1;
+    }
+
+    boolean movePrevious() {
+        if (!canGoPrevious()) {
+            return false;
+        }
+        currentIndex--;
+        return true;
+    }
+
+    boolean moveNext(boolean overflow) {
+        if (isEmpty()) {
+            return false;
+        }
+        if (canGoNext()) {
+            currentIndex++;
+            return true;
+        }
+        if (overflow) {
+            currentIndex = 0;
+            return true;
+        }
+        return false;
+    }
+
+    int getCurrentIndex() {
+        return currentIndex;
+    }
+
+    LoyaltyCardImageType peekNext(boolean overflow) {
+        if (isEmpty()) {
+            return LoyaltyCardImageType.NONE;
+        }
+
+        if (canGoNext()) {
+            return imageTypes.get(currentIndex + 1);
+        }
+
+        return overflow ? imageTypes.get(0) : getCurrent();
+    }
+
+    private int clampIndex(int index) {
+        if (imageTypes.isEmpty()) {
+            return 0;
+        }
+
+        return Math.max(0, Math.min(index, imageTypes.size() - 1));
+    }
+}
+
+enum LoyaltyCardImageType {
+    NONE,
+    ICON,
+    BARCODE,
+    IMAGE_FRONT,
+    IMAGE_BACK
+}
@@ -0,0 +1,183 @@
+package protect.card_locker.cardview;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.google.android.material.card.MaterialCardView;
+import com.google.android.material.color.MaterialColors;
+
+import java.nio.charset.Charset;
+
+import protect.card_locker.*;
+import protect.card_locker.async.TaskHandler;
+
+final class LoyaltyCardMainImageRenderer {
+    private final Context context;
+    private final TaskHandler tasks = new TaskHandler();
+    private final BarcodeImageWriterResultCallback barcodeCallback;
+
+    LoyaltyCardMainImageRenderer(
+            Context context,
+            BarcodeImageWriterResultCallback barcodeCallback
+    ) {
+        this.context = context;
+        this.barcodeCallback = barcodeCallback;
+    }
+
+    void renderCurrent(
+            LoyaltyCardImageType imageType,
+            Bitmap frontImageBitmap,
+            Bitmap backImageBitmap,
+            CatimaBarcode format,
+            Charset barcodeEncoding,
+            String cardIdString,
+            String barcodeIdString,
+            ImageView barcodeRenderTarget,
+            TextView mainImageDescription,
+            MaterialCardView mainCardView,
+            boolean isFullscreen,
+            boolean waitForResize
+    ) {
+        if (imageType == LoyaltyCardImageType.NONE) {
+            // With no renderable media left, show the raw card ID instead of an empty card area.
+            barcodeRenderTarget.setVisibility(View.GONE);
+            mainCardView.setCardBackgroundColor(Color.TRANSPARENT);
+            mainImageDescription.setTextColor(
+                    MaterialColors.getColor(
+                            mainImageDescription,
+                            com.google.android.material.R.attr.colorOnSurfaceVariant
+                    )
+            );
+            mainImageDescription.setText(cardIdString);
+            return;
+        }
+
+        if (imageType == LoyaltyCardImageType.BARCODE) {
+            barcodeRenderTarget.setBackgroundColor(Color.WHITE);
+            mainCardView.setCardBackgroundColor(Color.WHITE);
+            mainImageDescription.setTextColor(context.getResources().getColor(R.color.md_theme_light_onSurfaceVariant));
+
+            if (waitForResize) {
+                redrawBarcodeAfterResize(
+                        barcodeRenderTarget,
+                        barcodeIdString,
+                        cardIdString,
+                        format,
+                        barcodeEncoding,
+                        !isFullscreen,
+                        isFullscreen
+                );
+            } else {
+                drawBarcode(
+                        barcodeRenderTarget,
+                        barcodeIdString,
+                        cardIdString,
+                        format,
+                        barcodeEncoding,
+                        !isFullscreen,
+                        isFullscreen
+                );
+            }
+
+            mainImageDescription.setText(cardIdString);
+            barcodeRenderTarget.setContentDescription(
+                    context.getString(R.string.barcodeImageDescriptionWithType, format.prettyName())
+            );
+        } else if (imageType == LoyaltyCardImageType.IMAGE_FRONT) {
+            barcodeRenderTarget.setImageBitmap(frontImageBitmap);
+            barcodeRenderTarget.setBackgroundColor(Color.TRANSPARENT);
+            mainCardView.setCardBackgroundColor(Color.TRANSPARENT);
+            mainImageDescription.setTextColor(
+                    MaterialColors.getColor(
+                            mainImageDescription,
+                            com.google.android.material.R.attr.colorOnSurfaceVariant
+                    )
+            );
+            mainImageDescription.setText(context.getString(R.string.frontImageDescription));
+            barcodeRenderTarget.setContentDescription(context.getString(R.string.frontImageDescription));
+        } else if (imageType == LoyaltyCardImageType.IMAGE_BACK) {
+            barcodeRenderTarget.setImageBitmap(backImageBitmap);
+            barcodeRenderTarget.setBackgroundColor(Color.TRANSPARENT);
+            mainCardView.setCardBackgroundColor(Color.TRANSPARENT);
+            mainImageDescription.setTextColor(
+                    MaterialColors.getColor(
+                            mainImageDescription,
+                            com.google.android.material.R.attr.colorOnSurfaceVariant
+                    )
+            );
+            mainImageDescription.setText(context.getString(R.string.backImageDescription));
+            barcodeRenderTarget.setContentDescription(context.getString(R.string.backImageDescription));
+        } else {
+            throw new IllegalArgumentException("Unknown image type: " + imageType);
+        }
+
+        barcodeRenderTarget.setVisibility(View.VISIBLE);
+    }
+
+    private void redrawBarcodeAfterResize(
+            ImageView barcodeRenderTarget,
+            String barcodeIdString,
+            String cardIdString,
+            CatimaBarcode format,
+            Charset barcodeEncoding,
+            boolean addPadding,
+            boolean isFullscreen
+    ) {
+        if (format == null) {
+            return;
+        }
+
+        // Barcode dimensions depend on the final ImageView size, so wait for layout before rendering.
+        barcodeRenderTarget.getViewTreeObserver().addOnGlobalLayoutListener(
+                new ViewTreeObserver.OnGlobalLayoutListener() {
+                    @Override
+                    public void onGlobalLayout() {
+                        barcodeRenderTarget.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                        drawBarcode(
+                                barcodeRenderTarget,
+                                barcodeIdString,
+                                cardIdString,
+                                format,
+                                barcodeEncoding,
+                                addPadding,
+                                isFullscreen
+                        );
+                    }
+                });
+    }
+
+    private void drawBarcode(
+            ImageView barcodeRenderTarget,
+            String barcodeIdString,
+            String cardIdString,
+            CatimaBarcode format,
+            Charset barcodeEncoding,
+            boolean addPadding,
+            boolean isFullscreen
+    ) {
+        // Barcodes are regenerated eagerly because zoom/fullscreen changes affect the output bitmap.
+        tasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
+        if (format == null) {
+            return;
+        }
+
+        BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(
+                context.getApplicationContext(),
+                barcodeRenderTarget,
+                barcodeIdString != null ? barcodeIdString : cardIdString,
+                format,
+                barcodeEncoding,
+                null,
+                false,
+                barcodeCallback,
+                addPadding,
+                isFullscreen
+        );
+        tasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
+    }
+}
@@ -0,0 +1,246 @@
+package protect.card_locker.cardview;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.text.InputType;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.method.DigitsKeyListener;
+import android.text.style.ForegroundColorSpan;
+import android.text.util.Linkify;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.textfield.TextInputEditText;
+
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.function.Predicate;
+
+import protect.card_locker.*;
+
+final class LoyaltyCardViewDialogs {
+    interface BalanceUpdateListener {
+        void onBalanceUpdated(BigDecimal newBalance);
+    }
+
+    void showInfoDialog(Context context, LoyaltyCard loyaltyCard, List<Group> loyaltyCardGroups) {
+        AlertDialog.Builder infoDialog = new MaterialAlertDialogBuilder(context);
+
+        int dialogContentPadding = context.getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
+        infoDialog.setTitle(loyaltyCard.store);
+
+        TextView infoTextview = new TextView(context);
+        infoTextview.setPadding(
+                dialogContentPadding,
+                dialogContentPadding / 2,
+                dialogContentPadding,
+                0
+        );
+        infoTextview.setAutoLinkMask(Linkify.EMAIL_ADDRESSES | Linkify.PHONE_NUMBERS | Linkify.WEB_URLS);
+        infoTextview.setTextIsSelectable(true);
+
+        SpannableStringBuilder infoText = new SpannableStringBuilder();
+        if (!loyaltyCard.note.isEmpty()) {
+            infoText.append(loyaltyCard.note);
+        }
+
+        if (!loyaltyCardGroups.isEmpty()) {
+            List<String> groupNames = new ArrayList<>();
+            for (Group group : loyaltyCardGroups) {
+                groupNames.add(group._id);
+            }
+
+            padSpannableString(infoText);
+            infoText.append(context.getString(R.string.groupsList, TextUtils.join(", ", groupNames)));
+        }
+
+        if (hasBalance(loyaltyCard)) {
+            padSpannableString(infoText);
+            infoText.append(context.getString(
+                    R.string.balanceSentence,
+                    Utils.formatBalance(context, loyaltyCard.balance, loyaltyCard.balanceType)
+            ));
+        }
+
+        appendDateInfo(
+                context,
+                infoText,
+                loyaltyCard.validFrom,
+                Utils::isNotYetValid,
+                R.string.validFromSentence,
+                R.string.validFromSentence
+        );
+        appendDateInfo(
+                context,
+                infoText,
+                loyaltyCard.expiry,
+                Utils::hasExpired,
+                R.string.expiryStateSentenceExpired,
+                R.string.expiryStateSentence
+        );
+
+        infoTextview.setText(infoText);
+        infoDialog.setView(infoTextview);
+        infoDialog.setPositiveButton(R.string.ok, (dialogInterface, i) -> dialogInterface.dismiss());
+        infoDialog.create().show();
+    }
+
+    void showBalanceUpdateDialog(
+            Context context,
+            LoyaltyCard loyaltyCard,
+            BalanceUpdateListener balanceUpdateListener
+    ) {
+        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
+        builder.setTitle(R.string.updateBalanceTitle);
+
+        FrameLayout container = new FrameLayout(context);
+        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+        );
+        int contentPadding = context.getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
+        params.leftMargin = contentPadding;
+        params.topMargin = contentPadding / 2;
+        params.rightMargin = contentPadding;
+
+        LinearLayout layout = new LinearLayout(context);
+        layout.setOrientation(LinearLayout.VERTICAL);
+
+        TextView currentTextview = new TextView(context);
+        currentTextview.setText(context.getString(
+                R.string.currentBalanceSentence,
+                Utils.formatBalance(context, loyaltyCard.balance, loyaltyCard.balanceType)
+        ));
+        layout.addView(currentTextview);
+
+        final TextInputEditText input = new TextInputEditText(context);
+        input.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
+        input.setKeyListener(DigitsKeyListener.getInstance("0123456789,."));
+        input.setHint(R.string.updateBalanceHint);
+
+        layout.addView(input);
+        layout.setLayoutParams(params);
+        container.addView(layout);
+        builder.setView(container);
+
+        builder.setPositiveButton(R.string.spend, (dialogInterface, i) -> {
+            try {
+                BigDecimal balanceChange = Utils.parseBalance(input.getText().toString(), loyaltyCard.balanceType);
+                BigDecimal newBalance = loyaltyCard.balance.subtract(balanceChange).max(new BigDecimal(0));
+                balanceUpdateListener.onBalanceUpdated(newBalance);
+                Toast.makeText(
+                        context,
+                        context.getString(
+                                R.string.newBalanceSentence,
+                                Utils.formatBalance(context, newBalance, loyaltyCard.balanceType)
+                        ),
+                        Toast.LENGTH_LONG
+                ).show();
+            } catch (ParseException e) {
+                Toast.makeText(context, R.string.amountParsingFailed, Toast.LENGTH_LONG).show();
+            }
+        });
+        builder.setNegativeButton(R.string.receive, (dialogInterface, i) -> {
+            try {
+                BigDecimal balanceChange = Utils.parseBalance(input.getText().toString(), loyaltyCard.balanceType);
+                BigDecimal newBalance = loyaltyCard.balance.add(balanceChange);
+                balanceUpdateListener.onBalanceUpdated(newBalance);
+                Toast.makeText(
+                        context,
+                        context.getString(
+                                R.string.newBalanceSentence,
+                                Utils.formatBalance(context, newBalance, loyaltyCard.balanceType)
+                        ),
+                        Toast.LENGTH_LONG
+                ).show();
+            } catch (ParseException e) {
+                Toast.makeText(context, R.string.amountParsingFailed, Toast.LENGTH_LONG).show();
+            }
+        });
+        builder.setNeutralButton(context.getString(R.string.cancel), (dialog, which) -> dialog.cancel());
+        AlertDialog dialog = builder.create();
+
+        // Button state depends on the parsed input, so listeners must be bound after the dialog exists.
+        input.addTextChangedListener(new SimpleTextWatcher() {
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                BigDecimal balanceChange;
+
+                try {
+                    balanceChange = Utils.parseBalance(s.toString(), loyaltyCard.balanceType);
+                } catch (ParseException e) {
+                    input.setError(context.getString(R.string.amountParsingFailed));
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+                    return;
+                }
+
+                input.setError(null);
+                boolean hasNonZeroValue = !balanceChange.equals(new BigDecimal(0));
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(hasNonZeroValue);
+                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(hasNonZeroValue);
+            }
+        });
+
+        dialog.show();
+        // Touching dialog buttons before show() can crash because they are not created yet.
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+        dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+
+        if (dialog.getWindow() != null) {
+            dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        }
+        // Focus immediately so the keyboard opens on the amount field.
+        input.requestFocus();
+    }
+
+    private boolean hasBalance(LoyaltyCard loyaltyCard) {
+        return !loyaltyCard.balance.equals(new BigDecimal(0));
+    }
+
+    private SpannableStringBuilder padSpannableString(SpannableStringBuilder spannableStringBuilder) {
+        if (spannableStringBuilder.length() > 0) {
+            spannableStringBuilder.append("\n\n");
+        }
+
+        return spannableStringBuilder;
+    }
+
+    private void appendDateInfo(
+            Context context,
+            SpannableStringBuilder infoText,
+            Date date,
+            Predicate<Date> dateCheck,
+            @StringRes int dateCheckTrueString,
+            @StringRes int dateCheckFalseString
+    ) {
+        if (date == null) {
+            return;
+        }
+
+        String formattedDate = DateFormat.getDateInstance(DateFormat.LONG).format(date);
+
+        padSpannableString(infoText);
+        if (dateCheck.test(date)) {
+            int start = infoText.length();
+            infoText.append(context.getString(dateCheckTrueString, formattedDate));
+            infoText.setSpan(new ForegroundColorSpan(Color.RED), start, infoText.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+        } else {
+            infoText.append(context.getString(dateCheckFalseString, formattedDate));
+        }
+    }
+}
@@ -77,13 +77,6 @@ public class CardsContentProvider extends ContentProvider {
                        @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");
@@ -82,6 +82,10 @@ public class Settings {
        return getBoolean(R.string.settings_key_disable_lockscreen_while_viewing_card, true);
    }

+    public boolean getDisableNfcWhileViewingCard() {
+        return getBoolean(R.string.settings_key_disable_nfc_while_viewing_card, true);
+    }
+
    public boolean getAllowContentProviderRead() {
        return getBoolean(R.string.settings_key_allow_content_provider_read, true);
    }
@@ -157,12 +157,6 @@ class SettingsActivity : CatimaAppCompatActivity() {
                true
            }

-            // Disable content provider on SDK < 23 since dangerous permissions
-            // are granted at install-time
-            val contentProviderReadPreference = findPreference<Preference>(getString(R.string.settings_key_allow_content_provider_read))
-            contentProviderReadPreference!!.isVisible =
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-
            // Hide crash reporter settings on builds it's not enabled on
            val crashReporterPreference = findPreference<Preference>("acra.enable")
            crashReporterPreference!!.isVisible = BuildConfig.useAcraCrashReporter
@@ -109,7 +109,8 @@
                            android:id="@+id/storeNameEdit"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
-                            android:singleLine="true" />
+                            android:singleLine="true"
+                            android:inputType="textCapWords" />

                    </com.google.android.material.textfield.TextInputLayout>
                </LinearLayout>
@@ -6,97 +6,100 @@ Allan Nordhøy
 Heimen Stoffels
 Oğuz Ersen
 FC (Fay) Stegerman
+大王叫我来巡山
 B o d o
 StoyanDimitrov
-大王叫我来巡山
 SlavekB
-Katharine Chui
+Katharine Chui / Katie
 mondstern
 IllusiveMan196
 Silvério Santos
-Edgars Andersons
-Altonss
-Joel A
-Michael Moroni
-Liner Seven
-Priit Jõerüüt
-Fjuro
-GitSpoon
-Eric
 Максим Горпиніч
+Edgars Andersons
+Liner Seven
+Altonss
+Fjuro
+Joel A
+GitSpoon
+Michael Moroni
+Priit Jõerüüt
+Eric
 GM
-Petr Novák
 laralem
+Petr Novák
 Taco
-nadiafekihahmed
-Горпиніч Максим Олександрович
-pfaffenrodt
-Aayush Gupta
-Scrambled777
-josé m
-Vasilis
-ikanakova
-Nyatsuki
-Kachelkaiser
-Giovanni Donisi
 Milo Ivir
-HudobniVolk
+nadiafekihahmed
+pfaffenrodt
+Vasilis
+josé m
+Scrambled777
+Aayush Gupta
+Giovanni Donisi
+Nyatsuki
+ikanakova
+Kachelkaiser
 Jiri Grönroos
+HudobniVolk
 Warder
+109247019824
+Traductor
 Samantaz Fox
 Balázs Meskó
-109247019824
-Feike Donia
+mdvhimself
+AMIR-G98
+Feike
 Arno-github
-Ankit Tiwari
 Cliff Heraldo
 Sergio Paredes
+Ankit Tiwari
 Jose Delvani
-damjang
-mdvhimself
-Milan Šalka
-AMIR-G98
 Robin
-தமிழ்நேரம்
-huuhaa
-Skrripy
+Milan Šalka
+damjang
+Gideon
 Govindgopalyadav
+Skrripy
+huuhaa
+தமிழ்நேரம்
 waffshappen
 Marnick L'Eau
+JungHee Lee
+pacavarn
 ngocanhtve
 aradxxx
 StellarSand
 Quentin PAGÈS
 Projjal Moitra
-Traductor
 Aliaksandr Trush
 e-michalak
-JungHee Lee
 hajertabbane
 inavleb
-Ziad OUALHADJ
-Robin Liu
-Ricky Tigg
-Renko
-Gideon
 Denis Shilin
+Renko
+Ricky Tigg
+Robin Liu
+Ziad OUALHADJ
 しいたけ
 Alexander Ivanov
 Miha Frangež
 stavpup
 mrestivill
+ezn24
 ehrt74
 Virginie
 Tim Trek
-Peter Dave Hello
 Alì Mortacci
 Andre Costa
 arshbeerSingh
 Augustin LAVILLE
 Freddo espresso
-Vasudev R.
+Govind S Nair
 Kim Seohyun
 echo r"0xX4H" | rev
 rudy3
 Michael Gangolf
 PRATHAMESH BHAGAT 
+Peter Dave Hello
+Thomas Bertels
+Patrik
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
    <string name="action_search">بحث</string>
-    <string name="action_add">أضف</string>
-    <string name="noGiftCards">اضغط على زر الإضافة + لإضافة بطاقة، أو استورد من خلال⋮ القائمة</string>
-    <string name="noMatchingGiftCards">لا نتائج. حاول تغيير كلمات البحث.</string>
+    <string name="action_add">إضافة</string>
+    <string name="noGiftCards">اضغط على زر + لإضافة بطاقة، أو استورد من خلال قائمة ⋮</string>
+    <string name="noMatchingGiftCards">لا توجد نتائج. حاول تغيير بحثك.</string>
    <string name="storeName">اسم</string>
-    <string name="note">مذكرة</string>
+    <string name="note">ملاحظة</string>
    <string name="cardId">معرّف البطاقة</string>
    <string name="barcodeType">نوع الباركود</string>
    <string name="noBarcode">لا يوجد باركود</string>
-    <string name="star">أضف الى المفضلة</string>
-    <string name="unstar">حذف من المفضلة</string>
+    <string name="star">إضافة إلى المفضّلة</string>
+    <string name="unstar">حذف من المفضّلة</string>
    <string name="cancel">إلغاء</string>
    <string name="save">حفظ</string>
    <string name="edit">تعديل</string>
-    <string name="delete">إحذف</string>
+    <string name="delete">حذف</string>
    <string name="confirm">تأكيد</string>
-    <string name="deleteConfirmation">إحذف هذه البطاقة نهائيا؟</string>
-    <string name="ok">حسنا</string>
-    <string name="share">شارك</string>
-    <string name="sendLabel">ارسل…</string>
-    <string name="editCardTitle">عدل البطاقة</string>
-    <string name="addCardTitle">اضف بطاقة</string>
-    <string name="scanCardBarcode">مسح باركود</string>
+    <string name="deleteConfirmation">حذف هذه البطاقة نهائيًا؟</string>
+    <string name="ok">حسنًا</string>
+    <string name="share">مشاركة</string>
+    <string name="sendLabel">إرسال…</string>
+    <string name="editCardTitle">تعديل البطاقة</string>
+    <string name="addCardTitle">إضافة بطاقة</string>
+    <string name="scanCardBarcode">مسح الباركود</string>
    <string name="cardShortcut">اختصار البطاقة</string>
-    <string name="noCardsMessage">أضف بطاقة أولا</string>
+    <string name="noCardsMessage">أضف بطاقة أولًا</string>
    <string name="barcodeImageDescriptionWithType">صورة <xliff:g>%s</xliff:g> الباركود</string>
-    <string name="noCardExistsError">لم يعثر على هذه البطاقة</string>
-    <string name="failedParsingImportUriError">لا يمكن تحليل الرابط المستورد</string>
+    <string name="noCardExistsError">لم يتمّ العثور على تلك البطاقة</string>
+    <string name="failedParsingImportUriError">لا يمكن تحليل عنوان URL المستورد</string>
    <string name="importExport">استيراد/تصدير</string>
-    <string name="importExportHelp">إنشاء نسخة احتياطية من بياناتك تمكنك من نقلها إلى جهاز آخر</string>
-    <string name="importFailed">تعذر إجراء الاستيراد</string>
-    <string name="exportSuccessfulTitle">مصدّر</string>
+    <string name="importExportHelp">تتيح لك عملية النسخ الاحتياطي لبياناتك نقلها إلى جهاز آخر</string>
+    <string name="importFailed">تعذّر إجراء عملية الاستيراد</string>
+    <string name="exportSuccessfulTitle">تمّ التصدير</string>
    <string name="exportFailedTitle">فشل التصدير</string>
-    <string name="exportFailed">تعذر التصدير</string>
+    <string name="exportFailed">تعذّر إجراء عملية التصدير</string>
    <string name="exportOptionExplanation">ستكون البيانات مكتوبة في المسار الذي تختاره</string>
    <string name="importOptionFilesystemButton">من نظام الملفات</string>
    <string name="about">حول</string>
@@ -123,7 +123,7 @@
    <string name="unarchived">البطاقة غير مؤرشفة</string>
    <string name="failedLaunchingPhotoPicker">تعذر العثور على تطبيق معرض مدعوم</string>
    <string name="noGiftCardsGroup">أنشئ بعض البطاقات، ثم عيّنهم لهذه المجموعة</string>
-    <string name="deleteTitle">إحذف بطاقة</string>
+    <string name="deleteTitle">حذف البطاقة</string>
    <plurals name="selectedCardCount">
        <item quantity="zero"><xliff:g>%d</xliff:g> محدد</item>
        <item quantity="one"><xliff:g>%d</xliff:g> محددة</item>
@@ -132,11 +132,11 @@
        <item quantity="many"><xliff:g>%d</xliff:g> محدد</item>
        <item quantity="other"><xliff:g>%d</xliff:g> محدد</item>
    </plurals>
-    <string name="importing">جار الاستيراد…</string>
+    <string name="importing">جارٍ الاستيراد…</string>
    <string name="exportName">تصدير</string>
    <string name="exporting">جار التصدير…</string>
-    <string name="importSuccessfulTitle">مستورد</string>
-    <string name="importFailedTitle">فشل بالاستيراد</string>
+    <string name="importSuccessfulTitle">تمّ الاستيراد</string>
+    <string name="importFailedTitle">فشل الاستيراد</string>
    <string name="sort_by_most_recently_used">الأكثر أستعمالا مؤخرا</string>
    <string name="license">رخصة</string>
    <string name="sort_by_name">اسم</string>
@@ -150,20 +150,20 @@
        <item quantity="other"><xliff:g>%1$d</xliff:g> بطاقات ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
    </plurals>
    <plurals name="deleteCardsTitle">
-        <item quantity="zero">إحذف <xliff:g>%d</xliff:g> بطاقة</item>
-        <item quantity="one">إحذف <xliff:g>%d</xliff:g> بطاقة</item>
-        <item quantity="two">إحذف <xliff:g>%d</xliff:g> بطاقتين</item>
-        <item quantity="few">إحذف <xliff:g>%d</xliff:g> بطائق</item>
-        <item quantity="many">إحذف <xliff:g>%d</xliff:g> بطاقة</item>
-        <item quantity="other">إحذف <xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="zero">حذف <xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="one">حذف <xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="two">حذف <xliff:g>%d</xliff:g> بطاقتَين</item>
+        <item quantity="few">حذف <xliff:g>%d</xliff:g> من البطاقات</item>
+        <item quantity="many">حذف <xliff:g>%d</xliff:g> من البطاقات</item>
+        <item quantity="other">حذف <xliff:g>%d</xliff:g> من البطاقات</item>
    </plurals>
    <plurals name="deleteCardsConfirmation">
-        <item quantity="zero">إحذف هذه <xliff:g>%d</xliff:g> البطاقة نهائيا؟</item>
-        <item quantity="one">إحذف هذه <xliff:g>%d</xliff:g> البطاقة نهائيا؟</item>
-        <item quantity="two">إحذف هذه <xliff:g>%d</xliff:g> البطاقتين نهائيا؟</item>
-        <item quantity="few">إحذف هذه <xliff:g>%d</xliff:g> البطاقات نهائيا؟</item>
-        <item quantity="many">إحذف هذه <xliff:g>%d</xliff:g> البطاقات نهائيا؟</item>
-        <item quantity="other">إحذف هذه <xliff:g>%d</xliff:g> البطاقات نهائيا؟</item>
+        <item quantity="zero">حذف هذه <xliff:g>%d</xliff:g> البطاقة نهائيًا؟</item>
+        <item quantity="one">حذف هذه <xliff:g>%d</xliff:g> البطاقة نهائيًا؟</item>
+        <item quantity="two">حذف هذه <xliff:g>%d</xliff:g> البطاقتين نهائيًا؟</item>
+        <item quantity="few">حذف هذه <xliff:g>%d</xliff:g> البطاقات نهائيًا؟</item>
+        <item quantity="many">حذف هذه <xliff:g>%d</xliff:g> البطاقات نهائيًا؟</item>
+        <item quantity="other">حذف هذه <xliff:g>%d</xliff:g> البطاقات نهائيًا؟</item>
    </plurals>
    <string name="importOptionFilesystemTitle">الاستيراد من نظام الملفات</string>
    <string name="importOptionFilesystemExplanation">اختر ملفًا محددًا من نظام الملفات</string>
@@ -325,4 +325,6 @@
    <string name="back">رجوع</string>
    <string name="pref_enable_acra">إخطار بإرسال تقارير الأخطاء</string>
    <string name="pref_enable_acra_summary">عند التفعيل, سيتم سؤالك للابلاغ بالاعطال عندما تحدث. لا ولن يتم الابلاغ بالاعطال تلفائيا.</string>
+    <string name="settings_disable_nfc_while_viewing_card">وقف NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">وقف NFC لمنع NFC من العمل أثناء عرض بطاقة</string>
 </resources>
@@ -301,4 +301,8 @@
    <string name="nothing_to_copy">Няма стойност</string>
    <string name="back">Назад</string>
    <string name="barcodeEncoding">Кодиране на щрихкода</string>
+    <string name="settings_disable_nfc_while_viewing_card">Пауза на NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Спира NFC, за да бъдат предотвратени безконтактни плащания при преглед на карта</string>
+    <string name="nfc_blocked_while_viewing_card">NFC е на пауза</string>
+    <string name="change_settings">Настройки</string>
 </resources>
@@ -306,4 +306,5 @@
    <string name="pref_enable_acra_summary">Kada je omogućeno, bit ćete upitani da prijavite pad sistema kada se dogodi. Izvještaji o padu sistema se nikada ne šalju automatski.</string>
    <string name="copy_value">Kopiraj vrijednost</string>
    <string name="copied_to_clipboard">Kopirano u međuspremnik</string>
+    <string name="importCatimaMessage">Odaberite izvoz iz Catima za uvoz. \nKreirajte ga iz menija Uvoz/izvoz druge Catima aplikacije pritiskom na Izvoz.</string>
 </resources>
@@ -307,4 +307,8 @@
    <string name="nothing_to_copy">Nenalezena žádná hodnota</string>
    <string name="barcodeEncoding">Kódování čárového kódu</string>
    <string name="back">Zpět</string>
+    <string name="settings_disable_nfc_while_viewing_card">Pozastavit NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Pozastaví NFC pro zabránění spuštění NFC plateb při zobrazování karty</string>
+    <string name="nfc_blocked_while_viewing_card">NFC je pozastaveno</string>
+    <string name="change_settings">Změnit nastavení</string>
 </resources>
@@ -301,4 +301,8 @@
    <string name="nothing_to_copy">Keinen Betrag gefunden</string>
    <string name="barcodeEncoding">Barcode-Kodierung</string>
    <string name="back">Zurück</string>
+    <string name="change_settings">Einstellungen ändern</string>
+    <string name="nfc_blocked_while_viewing_card">NFC ist vorübergehend deaktiviert</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Deaktiviert vorübergehend NFC, sodass keine NFC-Zahlungen ausgelöst werden können, während eine Karte angezeigt wird</string>
+    <string name="settings_disable_nfc_while_viewing_card">NFC vorübergehend deaktivieren</string>
 </resources>
@@ -301,4 +301,8 @@
    <string name="nothing_to_copy">Δεν βρέθηκε τιμή</string>
    <string name="barcodeEncoding">Κωδικοποίηση γραμμωτού κώδικα</string>
    <string name="back">Πίσω</string>
+    <string name="settings_disable_nfc_while_viewing_card">Παύση NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Παύση του NFC για την αποτροπή ενεργοποίησης πληρωμών NFC κατά την προβολή μιας κάρτας</string>
+    <string name="nfc_blocked_while_viewing_card">Το NFC είναι σε παύση</string>
+    <string name="change_settings">Αλλαγή ρυθμίσεων</string>
 </resources>
@@ -192,7 +192,7 @@
    <string name="reverse">en orden inverso</string>
    <string name="sort_by_most_recently_used">Más recientemente usado</string>
    <string name="settings_use_volume_keys_navigation">Cambiar tarjetas usando los botones de volumen</string>
-    <string name="sort_by_valid_from">Válido Desde</string>
+    <string name="sort_by_valid_from">Válido desde</string>
    <string name="sort_by_expiry">Vencimiento</string>
    <string name="settings_use_volume_keys_navigation_summary">Usá los botones de volumen para cambiar la tarjeta que se muestra</string>
    <string name="cardWithNumberAndLocale">Tarjeta <xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>)</string>
@@ -227,4 +227,40 @@
    <string name="source_repository">Fuente de repositorio</string>
    <string name="and_data_usage">y uso de datos</string>
    <string name="include_if_asking_support">Si queres solicitar soporte, incluya la siguiente información:</string>
+    <string name="starred">Favoritos</string>
+    <string name="unarchive">Desarchivar</string>
+    <string name="unarchived">Carta desarchivada</string>
+    <string name="updateBalanceTitle">¿Cuánto gastó o ganó?</string>
+    <string name="anyDate">Cualquier fecha</string>
+    <string name="chooseValidFromDate">Elija fecha válida desde</string>
+    <string name="switchToFrontImage">Cambiar a imagen frontal</string>
+    <string name="switchToBackImage">Cambiar a imagen trasera</string>
+    <string name="switchToBarcode">Cambiar a código de barras</string>
+    <string name="openFrontImageInGalleryApp">Abrir imagen frontal en aplicación para ver imágenes</string>
+    <string name="openBackImageInGalleryApp">Abrir imagen trasera en galería de fotos</string>
+    <string name="setBarcodeHeight">Definir altura de código de barras</string>
+    <string name="show_name_below_image_thumbnail">Mostrar nombre de la imagen bajo su miniatura</string>
+    <string name="show_balance">Mostrar saldo</string>
+    <string name="show_validity">Mostrar validez</string>
+    <string name="settings_category_title_cards">Ver tarjeta</string>
+    <string name="settings_category_title_cards_overview">Ver todas las tarjetas</string>
+    <string name="settings_column_count_portrait">Columna en modo retrato</string>
+    <string name="settings_column_count_landscape">Columna en modo horizontal</string>
+    <string name="settings_automatic_column_count">Automático</string>
+    <string name="settings_column_count_1">1</string>
+    <string name="settings_column_count_2">2</string>
+    <string name="settings_column_count_3">3</string>
+    <string name="settings_column_count_4">4</string>
+    <string name="settings_column_count_5">5</string>
+    <string name="currentBalanceSentence">Balance actual: <xliff:g>%s</xliff:g></string>
+    <string name="newBalanceSentence">Nuevo balance: <xliff:g>%s</xliff:g></string>
+    <string name="validFromSentence">Válido desde <xliff:g>%s</xliff:g></string>
+    <string name="settings_column_count_6">6</string>
+    <string name="settings_column_count_7">7</string>
+    <string name="settings_category_title_general">General</string>
+    <string name="settings_category_title_privacy">Privacidad</string>
+    <string name="action_display_options">Mostrar Opciones</string>
+    <string name="show_archived_cards">Mostrar tarjetas archivadas</string>
+    <string name="view_online">Ver Online</string>
+    <string name="action_more_options">Más Opciones</string>
 </resources>
@@ -307,4 +307,8 @@
    <string name="nothing_to_copy">Ningún valor encontrado</string>
    <string name="barcodeEncoding">Codificación de barra de código</string>
    <string name="back">Atrás</string>
+    <string name="settings_disable_nfc_while_viewing_card">Pausar NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Pausa NFC para prevenir abonaciones NFC desde disparador mientras vea una tarjeta</string>
+    <string name="nfc_blocked_while_viewing_card">NFC está pausado</string>
+    <string name="change_settings">Cambiar ajustes</string>
 </resources>
@@ -301,4 +301,8 @@
    <string name="nothing_to_copy">Ühtegi väärtust ei leidu</string>
    <string name="barcodeEncoding">Triipkoodi kodeerimine</string>
    <string name="back">Tagasi</string>
+    <string name="settings_disable_nfc_while_viewing_card">Peata lähiväljaside (NFC)</string>
+    <string name="nfc_blocked_while_viewing_card">Lähiväljaside (NFC) on peatatud</string>
+    <string name="change_settings">Muuda seadistusi</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Vältimaks, et lähiväljaside (NFC) abil toimiv makseliides käivitub, lülitatakse kaardi vaatamisel lähiväljaside (NFC) välja</string>
 </resources>
@@ -3,8 +3,8 @@
    <string name="app_name">کاتیما</string>
    <string name="action_search">جستجو</string>
    <string name="action_add">افزودن</string>
-    <string name="noGiftCards">برای افزودن کارت دکمه + پلاس را بزنید, یا از ⋮ منو ایمپورت کنید.</string>
-    <string name="noGiftCardsGroup">تعدادی کارت ایجاد کنید، و سپس آنها را اینجا به گروه بیافزایید.</string>
+    <string name="noGiftCards">برای افزودن کارت، روی دکمه + کلیک کنید یا از منوی ⋮ کارت‌ها را وارد کنید.</string>
+    <string name="noGiftCardsGroup">چند کارت ایجاد کنید و سپس آن‌ها را در اینجا به این گروه اختصاص دهید.</string>
    <string name="noMatchingGiftCards">بدون نتیجه. سعی کنید جستجویتان را تغییر دهید.</string>
    <string name="storeName">نام</string>
    <string name="note">یادداشت</string>
@@ -10,17 +10,14 @@
    <string name="setBarcodeId">Aseta viivakoodin arvo</string>
    <string name="sameAsCardId">Sama kuin ID-tunnus</string>
    <string name="barcodeId">Viivakoodin arvo</string>
-    <string name="importVoucherVaultMessage">Valitse tuotava <i>vouchervault.json</i>-vienti Voucher Vaultista.
-\nLuo se painamalla ensin Vie Voucher Vaultissa.</string>
+    <string name="importVoucherVaultMessage">Valitse vienti Voucher Vaultista tuotavaksi. \nLuo se painamalla \"Export\" Voucher Vaultissa.</string>
    <string name="importVoucherVault">Tuo Voucher Vault -varmuuskopiotiedostosta</string>
    <string name="importLoyaltyCardKeychainMessage">Valitse tuotava <i>LoyaltyCardKeychain.csv</i>-vientitiedostosi Loyalty Card Keychainista.
 \nTai luo se Loyalty Card Keychainin Import/Export-valikosta painamalla ensin Export (Vie).</string>
    <string name="importLoyaltyCardKeychain">Tuo Loyalty Card Keychain varmuuskopiotiedostosta</string>
-    <string name="importFidmeMessage">Valitse tuotava <i>fidme-export-request-xxxxxxxx.zip</i>-vientitiedostosi FidMe:stä ja valitse viivakoodityypit manuaalisesti sen jälkeen.
-\nLuo se FidMe-profiilistasi valitsemalla Tietosuoja ja painamalla ensin Extract my data.</string>
+    <string name="importFidmeMessage">Valitse vienti FidMe:stä tuotavaksi ja valitse viivakoodityypit manuaalisesti sen jälkeen. \nLuo se FidMe-profiilistasi valitsemalla \"Data Protection\" ja painamalla \"Extract my data\".</string>
    <string name="importFidme">Tuo FidMe-varmuuskopiotiedostosta</string>
-    <string name="importCatimaMessage">Valitse tuotava <i>catima.zip</i>-vientitiedostosi Catimasta.
-\nLuo se Catima-sovelluksen Tuo/vie-valikosta painamalla siellä ensin Vie.</string>
+    <string name="importCatimaMessage">Valitse tuotava vientitiedosto Catimasta. \nLuo se Catima-sovelluksen Tuo/vie-valikosta painamalla siellä ensin Vie.</string>
    <string name="importCatima">Tuo Catima varmuuskopiotiedostosta</string>
    <string name="accept">Hyväksy</string>
    <string name="privacy_policy">Tietosuojakäytäntö</string>
@@ -47,14 +44,14 @@
    <string name="leaveWithoutSaveTitle">Poistu</string>
    <string name="moveDown">Siirrä alaspäin</string>
    <string name="moveUp">Siirrä ylöspäin</string>
-    <string name="failedOpeningFileManager">Asenna ensin tiedostonhallintaohjelma.</string>
+    <string name="failedOpeningFileManager">Tiedostonhallintaohjelman avaaminen epäonnistui</string>
    <string name="deleteConfirmationGroup">Poistetaanko ryhmä\?</string>
    <string name="all">Kaikki</string>
    <plurals name="groupCardCount">
        <item quantity="one"><xliff:g>%d</xliff:g> kortti</item>
        <item quantity="other"><xliff:g>%d</xliff:g> korttia</item>
    </plurals>
-    <string name="noGroups">Napsauta plus-painiketta (+) lisätäksesi ryhmät luokittelua varten.</string>
+    <string name="noGroups">Napsauta plus-painiketta (+) lisätäksesi ryhmät luokittelua varten</string>
    <string name="groups">Ryhmät</string>
    <string name="enter_group_name">Anna ryhmän nimi</string>
    <string name="exportSuccessful">Tiedot viety</string>
@@ -71,8 +68,8 @@
    <string name="starImage">Suosikkitähti</string>
    <string name="thumbnailDescription">Pienoiskuva</string>
    <string name="selectBarcodeTitle">Valitse viivakoodi</string>
-    <string name="app_resources">Vapaat kolmannen osapuolen resurssit: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="app_libraries">Vapaat kolmannen osapuolen kirjastot: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Kolmannen osapuolen resurssit: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Kolmannen osapuolen kirjastot: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="debug_version_fmt">Versio: <xliff:g id="version">%s</xliff:g></string>
    <string name="about_title_fmt">Tietoja <xliff:g id="app_name">%s</xliff:g></string>
    <string name="app_license">Copyleft (käyttäjänoikeus) - vapaa ohjelmisto, lisenssi GPLv3+</string>
@@ -81,9 +78,9 @@
    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Tekijänoikeus © 2019–<xliff:g>%d</xliff:g> Sylvia van Os ja avustajat</string>
    <string name="about">Tietoja</string>
    <string name="importOptionFilesystemButton">Tiedostojärjestelmästä</string>
-    <string name="importOptionFilesystemExplanation">Valitse tietty tiedosto tiedostojärjestelmästä.</string>
+    <string name="importOptionFilesystemExplanation">Valitse tietty tiedosto tiedostojärjestelmästä</string>
    <string name="importOptionFilesystemTitle">Tuo tiedostojärjestelmästä</string>
-    <string name="exportOptionExplanation">Tiedot kirjoitetaan valitsemaasi sijaintiin.</string>
+    <string name="exportOptionExplanation">Tiedot kirjoitetaan valitsemaasi sijaintiin</string>
    <string name="exporting">Viedään…</string>
    <string name="importing">Tuodaan…</string>
    <string name="exportFailed">Vienti epäonnistui</string>
@@ -92,10 +89,10 @@
    <string name="importFailed">Tuonti epäonnistui</string>
    <string name="importFailedTitle">Tuonti epäonnistui</string>
    <string name="importSuccessfulTitle">Tuonti valmis</string>
-    <string name="importExportHelp">Tietojesi varmuuskopiointi mahdollistaa niiden siirtämisen toiseen laitteeseen.</string>
+    <string name="importExportHelp">Tietojesi varmuuskopiointi mahdollistaa niiden siirtämisen toiseen laitteeseen</string>
    <string name="exportName">Vie</string>
    <string name="importExport">Tuo/vie</string>
-    <string name="failedParsingImportUriError">Tuonnin URI: n jäsentäminen epäonnistui</string>
+    <string name="failedParsingImportUriError">Tuonnin URI:n jäsentäminen epäonnistui</string>
    <string name="noCardExistsError">Tätä korttia ei löytynyt</string>
    <string name="noCardsMessage">Lisää ensin kortti</string>
    <string name="cardShortcut">Kortin pikakuvake</string>
@@ -118,7 +115,7 @@
    <string name="note">Lisätieto</string>
    <string name="storeName">Nimi</string>
    <string name="noMatchingGiftCards">Ei hakutuloksia, kokeile toisella hakutermillä.</string>
-    <string name="noGiftCards">Lisää kortti napsauttamalla plus-painiketta (+), tai mene ⋮-valikkoon tuodaksesi.</string>
+    <string name="noGiftCards">Lisää kortti napsauttamalla plus-painiketta (+), tai mene ⋮-valikkoon tuodaksesi</string>
    <string name="action_add">Lisää</string>
    <string name="action_search">Hae</string>
    <string name="takePhoto">Ota valokuva</string>
@@ -142,8 +139,8 @@
        <item quantity="one"><xliff:g>%d</xliff:g> valittu</item>
        <item quantity="other"><xliff:g>%d</xliff:g> valitut</item>
    </plurals>
-    <string name="passwordRequired">Ole hyvä ja syötä salasana</string>
-    <string name="failedGeneratingShareURL">Jaettavaa URL-osoitetta ei voitu luoda. Ilmoita tästä.</string>
+    <string name="passwordRequired">Syötä salasana</string>
+    <string name="failedGeneratingShareURL">Jaettavaa URL-osoitetta ei voitu luoda</string>
    <string name="turn_flashlight_on">Käytä taskulamppua</string>
    <string name="turn_flashlight_off">Sammuta salamavalo</string>
    <string name="app_contributors">Mahdollistanut: <xliff:g id="app_contributors">%s</xliff:g></string>
@@ -173,7 +170,7 @@
    <string name="on_github">GitHubissa</string>
    <string name="and_data_usage">ja datan käyttö</string>
    <string name="on_google_play">Google Playssa</string>
-    <string name="report_error">Ilmoita virheestä</string>
+    <string name="report_error">Ilmoita ongelmasta</string>
    <string name="shortcutSelectCard">Valitse kortti</string>
    <string name="starred">Tähdellä merkityt</string>
    <string name="options">Vaihtoehdot</string>
@@ -186,12 +183,12 @@
    <string name="translate_platform">Weblatessa</string>
    <string name="selectColor">Valitse väri</string>
    <string name="rate_this_app">Arvostele tämä sovellus</string>
-    <string name="noGiftCardsGroup">Lisää kortteja ja lisää ne ryhmään täällä.</string>
+    <string name="noGiftCardsGroup">Lisää kortteja ja lisää ne ryhmään täällä</string>
    <string name="barcodeImageDescriptionWithType">Kuva <xliff:g>%s</xliff:g> viivakoodi</string>
    <string name="unarchived">Kortti on poistettu arkistosta</string>
    <string name="unarchive">Poista arkistosta</string>
    <string name="archived">Kortti arkistoitu</string>
-    <string name="failedLaunchingPhotoPicker">Tuettua galleriasovellusta ei löytynyt</string>
+    <string name="failedLaunchingPhotoPicker">Tuettua kuvavalitsinta ei löytynyt</string>
    <plurals name="groupCardCountWithArchived">
        <item quantity="one"><xliff:g>%1$d</xliff:g> kortti (<xliff:g id="archivedCount">%2$d</xliff:g> arkistoitu)</item>
        <item quantity="other"><xliff:g>%1$d</xliff:g> korttia (<xliff:g id="archivedCount">%2$d</xliff:g> arkistoitu)</item>
@@ -226,14 +223,14 @@
    <string name="height">Korkeus</string>
    <string name="switchToFrontImage">Vaihda etukuvaan</string>
    <string name="switchToBarcode">Vaihda viivakoodiin</string>
-    <string name="openFrontImageInGalleryApp">Avaa etukuva galleriasovelluksessa</string>
+    <string name="openFrontImageInGalleryApp">Avaa etukuva kuvankatselusovelluksessa</string>
    <string name="settings_display_barcode_max_brightness_summary">Välttämätön, jotta jotkin skannerit toimivat</string>
    <string name="settings_keep_screen_on_summary">Poistaa näytön aikakatkaisun korttia katsellessa</string>
    <string name="settings_disable_lockscreen_while_viewing_card_summary">Poistaa näyttölukituksen käytöstä korttia katsellessa</string>
    <string name="settings_allow_content_provider_read_title">Salli muiden sovellusten käyttää omaa dataa</string>
    <string name="settings_oled_dark_summary">Vähentää akun käyttöä OLED-näytöillä</string>
    <string name="switchToBackImage">Vaihda takakuvaan</string>
-    <string name="openBackImageInGalleryApp">Avaa takakuva galleriasovelluksessa</string>
+    <string name="openBackImageInGalleryApp">Avaa takakuva kuvankatselusovelluksessa</string>
    <string name="setBarcodeHeight">Aseta viivakoodin korkeus</string>
    <string name="icon_header_click_text">Pitkä painallus pikkukuvan muokkaamiseksi</string>
    <string name="show_name_below_image_thumbnail">Näytä nimi pikkukuvan alapuolella</string>
@@ -284,12 +281,25 @@
    <string name="settings_column_count_4">4</string>
    <string name="settings_column_count_5">5</string>
    <string name="settings_column_count_7">7</string>
-    <string name="addFromPkpass">Valitse Passbook-tiedosto (.pkpass)</string>
+    <string name="addFromPkpass">Valitse Passbook-tiedosto (.pkpass / .pkpasses)</string>
    <string name="unsupportedFile">Tämä tiedosto ei ole tuettu</string>
-    <string name="generic_error_please_retry">Pahoittelut, jokin meni pieleen. Yritä uudelleen...</string>
+    <string name="generic_error_please_retry">Tapahtui virhe</string>
    <string name="sort_by_valid_from">Voimassa alkaen</string>
    <string name="width">Leveys</string>
    <string name="setBarcodeWidth">Aseta viivakoodin leveys</string>
    <string name="card_list_widget_name">Korttiluettelo</string>
    <string name="card_list_widget_empty">Kun olet lisännyt kanta-asiakaskortteja Catimaan, ne näkyvät täällä. Jos sinulla on kortteja, varmista, etteivät ne kaikki ole arkistoituja.</string>
+    <string name="cardWithNumber">Kortti <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Kortti <xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>)</string>
+    <string name="pleaseDoNotRotateTheDevice">Älä kierrä laitetta, koska se peruu toiminnon</string>
+    <string name="acra_catima_has_crashed">Valitettavasti <xliff:g id="app_name">%s</xliff:g> kaatui. Auta korjaamaan ongelma lähettämällä virheraportti.</string>
+    <string name="pref_enable_acra">Kysy kaatumisraporttien lähettämisestä</string>
+    <string name="pref_enable_acra_summary">Kun käytössä, sinulta kysytään lupa lähettää raportti kaatumisen yhteydessä. Kaatumisraportteja ei koskaan lähetetä automaattisesti.</string>
+    <string name="copy_value">Kopioi arvo</string>
+    <string name="copied_to_clipboard">Kopioitu leikepöydälle</string>
+    <string name="nothing_to_copy">Arvoa ei löytynyt</string>
+    <string name="barcodeEncoding">Viivakoodin koodaus</string>
+    <string name="back">Takaisin</string>
+    <string name="acra_explain_crash">Jos mahdollista lisää tietoja toiminnastasi täällä:</string>
+    <string name="acra_crash_email_subject"><xliff:g id="app_name">%s</xliff:g> pysähtymisraportti</string>
 </resources>
@@ -307,4 +307,8 @@
    <string name="nothing_to_copy">Aucune valeur trouvée</string>
    <string name="barcodeEncoding">Encodage du code-barres</string>
    <string name="back">Retour</string>
+    <string name="settings_disable_nfc_while_viewing_card">Mettre en pause le NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Mettre en pause le NFC pour éviter le déclenchement de paiements NFC lors de la consultation d\'une carte</string>
+    <string name="nfc_blocked_while_viewing_card">Le NFC est en pause</string>
+    <string name="change_settings">Modifier les paramètres</string>
 </resources>
@@ -300,4 +300,8 @@
    <string name="nothing_to_copy">Non hai ningún valor</string>
    <string name="barcodeEncoding">Códificación do código de barras</string>
    <string name="back">Volver</string>
+    <string name="settings_disable_nfc_while_viewing_card">NFC en pausa</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Detén o NFC para evitar a activación de pago con NFC cando se mira unha tarxeta</string>
+    <string name="nfc_blocked_while_viewing_card">NFC está en pausa</string>
+    <string name="change_settings">Cambiar axustes</string>
 </resources>
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="action_add">הוספה</string>
    <string name="cardId">מזהה כרטיס</string>
    <string name="cancel">ביטול</string>
    <string name="save">שמור</string>
    <string name="ok">אישור</string>
    <string name="action_search">חיפוש</string>
-    <string name="noGiftCards">לחץ על לחצן ה + להוספת כרטיס, או ייבא מספר כרטיסים באמצעות התפריט ⋮.</string>
+    <string name="noGiftCards">לחץ על כפתור הפלוס (+) כדי להוסיף כרטיס, או ייבא כרטיס מהתפריט ⋮.</string>
    <string name="share">שיתוף</string>
    <string name="addCardTitle">הוספת כרטיס</string>
    <string name="star">הוספה למועדפים</string>
@@ -16,7 +16,7 @@
    <string name="noBarcode">אין ברקוד</string>
    <string name="edit">עריכה</string>
    <string name="exportFailed">לא ניתן לייצא</string>
-    <string name="noGiftCardsGroup">צור מספר כרטיסים, ואז שייך אותם לקבוצה פה.</string>
+    <string name="noGiftCardsGroup">צור מספר כרטיסים, ולאחר מכן שייך אותם לקבוצה.</string>
    <string name="failedParsingImportUriError">נתיב לא נמצא</string>
    <string name="noMatchingGiftCards">אין תוצאות. נסה חיפוש אחר.</string>
    <string name="storeName">שם חנות</string>
@@ -51,4 +51,19 @@
    <string name="multipleBarcodesFoundPleaseChooseOne">באיזה מהברקודים שנמצאו אתה רוצה להשתמש?</string>
    <string name="useFrontImage">השתמש בתמונה קדמית</string>
    <string name="useBackImage">השתמש בתמונה אחורית</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> נבחר</item>
+        <item quantity="two"><xliff:g>%d</xliff:g> נבחרו</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> נבחרו</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">הסר <xliff:g>%d</xliff:g> כרטיסייה</item>
+        <item quantity="two">הסר <xliff:g>%d</xliff:g> כרטיסיות</item>
+        <item quantity="other">הסר <xliff:g>%d</xliff:g> כרטיסיות</item>
+    </plurals>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">להסיר את <xliff:g>%d</xliff:g> הכרטיסייה לצמיתות?</item>
+        <item quantity="two">להסיר את <xliff:g>%d</xliff:g> הכרטיסיות לצמיתות?</item>
+        <item quantity="other">להסיר את <xliff:g>%d</xliff:g> הכרטיסיות לצמיתות?</item>
+    </plurals>
 </resources>
@@ -298,4 +298,6 @@
    <string name="copy_value">मान कॉपी करें</string>
    <string name="copied_to_clipboard">क्लिपबोर्ड पर कॉपी किया गया</string>
    <string name="nothing_to_copy">कोई मूल्य नहीं मिला</string>
+    <string name="barcodeEncoding">बारकोड एन्कोडिंग</string>
+    <string name="back">वापस</string>
 </resources>
@@ -305,4 +305,10 @@
    <string name="copied_to_clipboard">Kopirano u međuspremnik</string>
    <string name="back">Natrag</string>
    <string name="copy_value">Kopiraj vrijednost</string>
+    <string name="nothing_to_copy">Nije pronađena vrijednost</string>
+    <string name="barcodeEncoding">Kodiranje barkoda</string>
+    <string name="change_settings">Promijeni postavke</string>
+    <string name="settings_disable_nfc_while_viewing_card">Pauziraj NFC</string>
+    <string name="nfc_blocked_while_viewing_card">NFC je pauziran</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Pauzira NFC kako bi se spriječilo aktiviranje NFC plaćanja tijekom prikazivanja kartice</string>
 </resources>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
-    <string name="noGiftCards">Kattintson a + plusz gombra egy kártya hozzáadásához, vagy importáljon a ⋮ menüből.</string>
+    <string name="noGiftCards">Koppintson a + plusz gombra egy kártya hozzáadásához, vagy importáljon a ⋮ menüből</string>
    <string name="action_add">Hozzáadás</string>
    <string name="action_search">Keresés</string>
    <plurals name="selectedCardCount">
@@ -8,7 +8,7 @@
        <item quantity="other"><xliff:g>%d</xliff:g> kiválasztva</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="noGiftCardsGroup">Hozzon létre kártyákat, és rendelje hozzá a megfelelő csoporthoz</string>
    <string name="noMatchingGiftCards">Nincs találat. Próbálja módosítani a keresést.</string>
    <string name="storeName">Név</string>
    <string name="note">Feljegyzés</string>
@@ -32,12 +32,12 @@
    <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 beolvasása</string>
    <string name="cardShortcut">Kártya parancsikon</string>
    <string name="failedParsingImportUriError">Az importálási URI nem értelmezhető</string>
-    <string name="importExport">Importálás/exportálás</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="importExportHelp">Az adatok mentése lehetővé teszi, hogy egy másik eszközre helyezze át</string>
    <string name="importSuccessfulTitle">Importálva</string>
    <string name="importFailedTitle">Az importálás sikertelen</string>
    <string name="importFailed">Nem sikerült az importálás végrehajtása</string>
@@ -49,14 +49,14 @@
    </plurals>
    <string name="deleteTitle">Kártya törlése</string>
    <string name="barcodeImageDescriptionWithType">A(z) <xliff:g>%s</xliff:g> vonalkód képe</string>
-    <string name="noCardExistsError">A kártya nem található</string>
+    <string name="noCardExistsError">Kártya nem található</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="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="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ó webcímet előállítani</string>
    <string name="sort">Rendezés</string>
    <string name="on_google_play">a Google Playen</string>
    <string name="and_data_usage">és adathasználat</string>
@@ -68,7 +68,7 @@
    <string name="exportFailed">Nem sikerült az exportálás végrehajtása</string>
    <string name="importing">Importálás…</string>
    <string name="exporting">Exportálás…</string>
-    <string name="exportOptionExplanation">Az adatok a kiválasztott helyre lesznek mentve.</string>
+    <string name="exportOptionExplanation">Az adatok a kiválasztott helyre kerülnek mentésre</string>
    <string name="importOptionFilesystemTitle">Importálás fájlrendszerből</string>
    <string name="importOptionFilesystemButton">A fájlrendszerből</string>
    <string name="app_license">Copyleft licencű szabad szoftver, GPLv3+ alatt közzétéve</string>
@@ -91,7 +91,7 @@
    <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="failedOpeningFileManager">Fájl böngésző nem elérhető</string>
    <string name="moveUp">Mozgatás felfelé</string>
    <string name="moveDown">Mozgatás lefelé</string>
    <string name="leaveWithoutSaveTitle">Kilépés</string>
@@ -108,7 +108,7 @@
    <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="noBarcodeFound">Nem található vonalkód</string>
-    <string name="errorReadingImage">Nem lehet olvasni a képet</string>
+    <string name="errorReadingImage">Kép nem olvasható</string>
    <string name="balance">Egyenleg</string>
    <string name="currency">Pénznem</string>
    <string name="points">Pontok</string>
@@ -118,10 +118,8 @@
    <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="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="importLoyaltyCardKeychainMessage">Jelölje ki az importálandó Loyalty Card Keychain exportot. \nLétre tudja hozni a Loyalty Card Keychain Importálás/Exportálás menün belül az Exportálásra koppintva.</string>
+    <string name="importVoucherVaultMessage">Jelölje ki az importálandó Voucher Vault exportot. \nLétre tudja hozni a Voucher Vault-on belüli Exportálás menüben.</string>
    <string name="barcodeId">Vonalkód értéke</string>
    <string name="sameAsCardId">Ugyanaz, mint az azonosító</string>
    <string name="setBarcodeId">Vonalkód értékének beállítása</string>
@@ -167,30 +165,28 @@
    </plurals>
    <string name="chooseImportType">Adatok importálása innen</string>
    <string name="thumbnailDescription">Előkép</string>
-    <string name="importOptionFilesystemExplanation">Válassza ki a kívánt fájlt a fájlrendszerből.</string>
+    <string name="importOptionFilesystemExplanation">Válassza ki a kívánt fájlt a fájlrendszerből</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>
    <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="noGroups">Koppintson a + gombra 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="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="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="importCatimaMessage">Válassza ki a megfelelő exportált Catima elemet importálásra. \nA menüben található Importálás/Exportálásból importálhat egy korábbi Catima exportot.</string>
+    <string name="importFidmeMessage">Jelölje ki az importálandó FidMe exportot, ezt követően adja meg kézileg a vonalkód típust. \nLétre tudja hozni a FidMe profiljából az Adatvédelmen belül a Adatom kinyerése opcióval.</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>
    </plurals>
    <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="failedLaunchingPhotoPicker">Nem található támogatott képválasztó</string>
    <string name="previousCard">Előző</string>
    <string name="nextCard">Következő</string>
    <string name="settings_oled_dark">Teljesen fekete háttér a sötét témánál</string>
@@ -228,7 +224,7 @@
    <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="permissionReadCardsLabel">Catima kártyák beolvasása</string>
    <string name="permissionReadCardsDescription">olvassa el a Catima-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>
@@ -257,7 +253,7 @@
    <string name="app_name">Catima</string>
    <string name="amountParsingFailed">Hibás érték</string>
    <string name="add_manually_warning_title">Szkennelés ajánlott</string>
-    <string name="add_manually_warning_message">Egyes boltoknál a kártyán levő számsor különbözik a vonalkódtól. Emiatt a manuális szám beírás nem minden esetben fog működni. Erősen ajánlott inkább a vonalkód szkennelése kamerával. Biztosan folytatja?</string>
+    <string name="add_manually_warning_message">Egyes kártyákon levő számsor különbözik a vonalkód számától. Emiatt a manuális szám beírás nem minden esetben működni. Ajánlott tehát a vonalkód beolvasása kamerával. Biztosan folytatja?</string>
    <string name="continue_">Tovább</string>
    <string name="spend">Költött</string>
    <string name="receive">Megkapott</string>
@@ -282,12 +278,31 @@
    <string name="settings_column_count_6">6</string>
    <string name="settings_column_count_3">3</string>
    <string name="settings_column_count_1">1</string>
-    <string name="addFromPkpass">Válassz egy Passbook fájlt (.pkpass)</string>
+    <string name="addFromPkpass">Válasszon egy Passbook fájlt (.pkpass / .pkpasses)</string>
    <string name="unsupportedFile">Ez a fájl nem támogatott</string>
-    <string name="generic_error_please_retry">Sajnálom, valami rosszul ment, próbálkozz újra...</string>
+    <string name="generic_error_please_retry">Hiba lépett fel</string>
    <string name="settings_column_count_4">4</string>
    <string name="settings_column_count_7">7</string>
    <string name="sort_by_valid_from">Érvényesség kezdete</string>
    <string name="width">Szélesség</string>
-    <string name="setBarcodeWidth">Vonalkód szélességének beállítása</string>
+    <string name="setBarcodeWidth">Vonalkód szélesség beállítása</string>
+    <string name="settings_disable_nfc_while_viewing_card">NFC leállítása</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Az NFC leállítása a kártya megtekintés erejéig, hogy ne indítsa be az NFC fizetést</string>
+    <string name="card_list_widget_name">Kártya lista</string>
+    <string name="card_list_widget_empty">Miután hozzáadja a kártyákat a Catima-hoz, itt fognak megjelenni. Ha vannak kártyái, győződjön meg, hogy nincsenek e archiválva.</string>
+    <string name="cardWithNumber"><xliff:g>%d</xliff:g> kártya</string>
+    <string name="cardWithNumberAndLocale"><xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>) kártya</string>
+    <string name="pleaseDoNotRotateTheDevice">Kérem ne forgassa el az eszközt, mert az megszakítja a műveletet</string>
+    <string name="acra_catima_has_crashed">Sajnos a <xliff:g id="app_name">%s</xliff:g> összeomlott. Segítsen ezt a hibát megoldani, azzal, hogy elküldi a jelentést számunkra.</string>
+    <string name="acra_explain_crash">Ha lehetséges adja meg, hogy éppen milyen műveletet végzett:</string>
+    <string name="acra_crash_email_subject"><xliff:g id="app_name">%s</xliff:g> összeomlási jelentés</string>
+    <string name="pref_enable_acra">Kérje az összeomlási jelentéseket</string>
+    <string name="pref_enable_acra_summary">Bekapcsolása esetén mindig kéri az összeomlási jelentés küldését. A jelentések sosem kerülnek küldésre automatikusan.</string>
+    <string name="copy_value">Érték másolása</string>
+    <string name="copied_to_clipboard">Vágólapra másolva</string>
+    <string name="nothing_to_copy">Nem található érték</string>
+    <string name="barcodeEncoding">Vonalkód kódolás</string>
+    <string name="back">Vissza</string>
+    <string name="nfc_blocked_while_viewing_card">NFC leállítva</string>
+    <string name="change_settings">Beállítások változtatása</string>
 </resources>
@@ -292,4 +292,7 @@
    <string name="pref_enable_acra_summary">Ketika diaktifkan, Anda akan diminta untuk melaporkan crash saat terjadi. Laporan crash tidak pernah dikirim secara otomatis.</string>
    <string name="copy_value">Salin nilai</string>
    <string name="copied_to_clipboard">Disalin ke papan klip</string>
+    <string name="nothing_to_copy">Tidak ditemukan nilai</string>
+    <string name="barcodeEncoding">Pengkodean barcode</string>
+    <string name="back">Kembali</string>
 </resources>
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="action_add">Bæta</string>
-    <string name="noBarcode">Nei strikamerkið</string>
+    <string name="noBarcode">Ekkert strikamerki</string>
    <string name="action_search">Leita að</string>
    <string name="delete">Eyða</string>
-    <string name="noGiftCards">Smelltu á + plús takka til að bæta korti, eða að flytja inn frá ⋮ Valmynd.</string>
+    <string name="noGiftCards">Smelltu á + plús takka til að bæta korti, eða að flytja inn frá ⋮ Valmynd</string>
    <string name="note">Athugið</string>
    <string name="barcodeType">Strikamerkið tegund</string>
    <string name="cancel">Hætta</string>
@@ -12,61 +12,61 @@
    <string name="storeName">Nafnið</string>
    <string name="star">Bæta við eftirlæti</string>
    <string name="unstar">Fjarlægja frá eftirlæti</string>
-    <string name="save">Sparaðu</string>
+    <string name="save">Vista</string>
    <string name="edit">Breyta</string>
    <string name="confirm">Staðfesta</string>
    <string name="ok">OK</string>
    <string name="sendLabel">Sendu…</string>
-    <string name="deleteConfirmation">Eyða þetta kort til frambúðar\?</string>
+    <string name="deleteConfirmation">Eyða þessu korti til frambúðar?</string>
    <string name="share">Deila</string>
-    <string name="editCardTitle">Breyta Kort</string>
-    <string name="addCardTitle">Bæta Kort</string>
-    <string name="scanCardBarcode">Skanna Kort Strikamerkið</string>
-    <string name="noCardsMessage">Bæta kort fyrstu</string>
-    <string name="exportFailedTitle">Flytja mistókst</string>
-    <string name="exportSuccessfulTitle">Flutt</string>
-    <string name="noCardExistsError">Gæti ekki fundið kort</string>
-    <string name="failedParsingImportUriError">Get ekki lesið inn URI</string>
-    <string name="exportName">Flytja</string>
-    <string name="importExportHelp">Stuðningur upp spil gerir þér kleift að færa þá til annar tæki.</string>
-    <string name="importSuccessfulTitle">Flutt</string>
+    <string name="editCardTitle">Breyta Korti</string>
+    <string name="addCardTitle">Bæta við korti</string>
+    <string name="scanCardBarcode">Skanna Strikamerkið</string>
+    <string name="noCardsMessage">Bæta fyrst við korti</string>
+    <string name="exportFailedTitle">Útflutningur mistókst</string>
+    <string name="exportSuccessfulTitle">Flutt út</string>
+    <string name="noCardExistsError">Gat ekki fundið þetta kort</string>
+    <string name="failedParsingImportUriError">Get ekki flutt inn URI</string>
+    <string name="exportName">Flytja út</string>
+    <string name="importExportHelp">Afritun gagna gerir þér kleift að færa það á annað tæki</string>
+    <string name="importSuccessfulTitle">Flutt inn</string>
    <string name="importFailedTitle">Innflutningur mistókst</string>
-    <string name="exportOptionExplanation">Gögnum verður skrifað á stað af eigin vali.</string>
+    <string name="exportOptionExplanation">Gögnin verðs skrifuð á stað sem þú velur</string>
    <string name="importOptionFilesystemTitle">Innflutningur frá möppuna</string>
-    <string name="importOptionFilesystemExplanation">Velja ákveðna skrá frá möppuna.</string>
+    <string name="importOptionFilesystemExplanation">Velja ákveðna skrá úr skráakerfinu</string>
    <string name="starImage">Uppáhalds stjörnu</string>
    <string name="never">Aldrei</string>
    <string name="currency">Mynt</string>
    <string name="moveBarcodeToTopOfScreen">Færa strikamerkið að efst á skjánum</string>
-    <string name="errorReadingImage">Gat ekki lesið ímynd</string>
+    <string name="errorReadingImage">Gat ekki lesið mynd</string>
    <string name="about">Um</string>
    <string name="settings">Stillingar</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="settings_disable_lockscreen_while_viewing_card">Koma í veg fyrir skjálæsingu</string>
    <string name="editBarcode">Breyta strikamerkið</string>
    <string name="settings_light_theme">Ljós</string>
    <string name="importOptionFilesystemButton">Frá möppuna</string>
-    <string name="chooseImportType">Flytja gögn úr\?</string>
+    <string name="chooseImportType">Flytja gögn úr</string>
    <string name="balance">Jafnvægi</string>
    <string name="points">Stig</string>
-    <string name="selectBarcodeTitle">Veldu Strikamerkið</string>
-    <string name="thumbnailDescription">Þumalinn fyrir kort</string>
+    <string name="selectBarcodeTitle">Velja strikamerki</string>
+    <string name="thumbnailDescription">Táknmynd</string>
    <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_system_theme">Kerfi</string>
    <string name="settings_dark_theme">Dökk</string>
-    <string name="settings_display_barcode_max_brightness">Bjartari strikamerkið skoða</string>
+    <string name="settings_display_barcode_max_brightness">Bjartari skjá</string>
    <string name="enter_group_name">Inn nafn hópur</string>
    <string name="intent_import_card_from_url_share_text">Ég vil deila kort með þér</string>
-    <string name="importSuccessful">Kortið gögn flutt</string>
+    <string name="importSuccessful">Gögn flutt inn</string>
    <string name="groups">Tekur</string>
-    <string name="exportSuccessful">Kortagögn flutt út</string>
-    <string name="failedOpeningFileManager">Setja skráasafn fyrst.</string>
+    <string name="exportSuccessful">Gögn flutt út</string>
+    <string name="failedOpeningFileManager">Gat ekki opnað skráakerfistjóra</string>
    <string name="moveUp">Fara upp</string>
    <string name="leaveWithoutSaveTitle">Brottför</string>
    <string name="leaveWithoutSaveConfirmation">Fara án þess að bjarga\?</string>
-    <string name="addFromImage">Veldu mynd frá gallerí</string>
+    <string name="addFromImage">Veldu mynd úr gallerí</string>
    <string name="card">Kort</string>
    <string name="expiryDate">Fyrningu</string>
    <string name="moveDown">Fara neðar</string>
@@ -75,8 +75,32 @@
        <item quantity="one"><xliff:g>%d</xliff:g> valið</item>
        <item quantity="other"><xliff:g>%d</xliff:g> valin</item>
    </plurals>
-    <string name="noGiftCardsGroup">Búðu til nokkur kort og settu þau síðan í hópinn hér.</string>
+    <string name="noGiftCardsGroup">Búðu til nokkur kort og settu þau síðan í hópinn hér</string>
    <string name="sort">flokka</string>
    <string name="sort_by">flokka Eftir</string>
    <string name="nextCard">Næsta</string>
-</resources>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Eyða þessu <xliff:g>%d</xliff:g> korti varanlega?</item>
+        <item quantity="other">Eyða þessum <xliff:g>%d</xliff:g> kortum varanlega?</item>
+    </plurals>
+    <string name="barcodeImageDescriptionWithType">Mynd <xliff:g>%s</xliff:g> strikamerki</string>
+    <string name="importExport">Flytja inn/út</string>
+    <string name="importFailed">Gat ekki flutt inn</string>
+    <string name="app_name">Catima</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Eyða <xliff:g>%d</xliff:g> korti</item>
+        <item quantity="other">Eyða <xliff:g>%d</xliff:g> kortum</item>
+    </plurals>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> kort</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kort</item>
+    </plurals>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> punktur</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> punktar</item>
+    </plurals>
+    <string name="previousCard">Fyrra</string>
+    <string name="failedToOpenUrl">Settu inn vef-vafra fyrst</string>
+    <string name="welcome">Velkomin að Catima</string>
+    <string name="importCards">Flytja inn kort</string>
+</resources>
@@ -3,7 +3,7 @@
    <string name="action_search">Cerca</string>
    <string name="action_add">Aggiungi</string>
    <string name="noGiftCards">Premi il pulsante + per aggiungere una carta oppure importala dal menù ⋮</string>
-    <string name="noMatchingGiftCards">Nessun risultato. Prova a cambiare la tua ricerca.</string>
+    <string name="noMatchingGiftCards">Nessun risultato. Prova a modificare la ricerca.</string>
    <string name="storeName">Nome</string>
    <string name="note">Note</string>
    <string name="cardId">Codice</string>
@@ -307,4 +307,8 @@
    <string name="nothing_to_copy">Nessun valore trovato</string>
    <string name="barcodeEncoding">Codifica codici a barre</string>
    <string name="back">Indietro</string>
+    <string name="settings_disable_nfc_while_viewing_card">Pausa NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Sospende la funzione NFC per impedire che i pagamenti NFC vengano attivati durante la visualizzazione di una carta</string>
+    <string name="nfc_blocked_while_viewing_card">La funzione NFC è disattivata</string>
+    <string name="change_settings">Modifica impostazioni</string>
 </resources>
@@ -8,4 +8,9 @@
    </plurals>
    <string name="action_add">הוסף</string>
    <string name="noGiftCards">לחץ על כפתור הפלוס (+) כדי להוסיף כרטיס, או ייבא מתפריט ⋮.</string>
+    <string name="noMatchingGiftCards">אין תוצאות. נסה לשנות את החיפוש.</string>
+    <string name="storeName">שם החנות</string>
+    <string name="note">הערות</string>
+    <string name="barcodeType">סוג ברקוד</string>
+    <string name="noBarcode">אין ברקוד</string>
 </resources>
@@ -294,4 +294,8 @@
    <string name="nothing_to_copy">値が見つかりません</string>
    <string name="barcodeEncoding">バーコードの符号化</string>
    <string name="back">戻る</string>
+    <string name="settings_disable_nfc_while_viewing_card">NFCを一時停止</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">カードの表示中にNFC決済が誤って実行されないようにNFCを一時停止します</string>
+    <string name="nfc_blocked_while_viewing_card">NFCは停止中です</string>
+    <string name="change_settings">設定を変更する</string>
 </resources>
@@ -87,7 +87,7 @@
    <string name="settings_locale">언어</string>
    <string name="settings_system_locale">시스템</string>
    <string name="selectColor">색상 선택</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="showMoreInfo">정보 보기</string>
    <string name="updateBalance">잔액 업데이트</string>
    <string name="failedToRetrieveImageFile">이미지 파일을 검색하지 못했습니다</string>
@@ -210,17 +210,13 @@
    <string name="app_loyalty_card_keychain">로열티 카드 키체인</string>
    <string name="privacy_policy">개인 정보 정책</string>
    <string name="importCatima">Catima에서 가져오기</string>
-    <string name="importCatimaMessage">가져올 Catima에서 <i>catima.zip</i> 내보내기를 선택합니다.
-\n먼저 내보내기를 눌러 다른 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="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="importVoucherVault">Voucher Vault에서 가져오기</string>
-    <string name="importVoucherVaultMessage">가져올 Voucher Vault에서 <i>vouchervault.json</i> 내보내기를 선택합니다.
-\n먼저 바우처 금고에서 내보내기를 눌러 생성하세요.</string>
+    <string name="importVoucherVaultMessage">가져올 Voucher Vault에서 <i>vouchervault.json</i> 내보내기를 선택합니다. \n먼저 바우처 금고에서 내보내기를 눌러 생성하세요.</string>
    <string name="sameAsCardId">아이디와 동일</string>
    <string name="previousCard">이전의</string>
    <string name="nextCard">다음</string>
@@ -284,4 +280,5 @@
    <string name="sort_by_valid_from">유효 기간</string>
    <string name="width">너비</string>
    <string name="setBarcodeWidth">바코드 너비를 설정하세요</string>
+    <string name="card_list_widget_name">카드 목록</string>
 </resources>
@@ -280,4 +280,8 @@
    <string name="sort_by_valid_from">Teisinga forma</string>
    <string name="settings_use_volume_keys_navigation">Keisti korteles su garso mygtukais</string>
    <string name="settings_use_volume_keys_navigation_summary">Naudokite garso mygtukus kortelių pakeitimui</string>
+    <string name="settings_category_title_cards_overview">Kortelių apžvalga</string>
+    <string name="settings_column_count_portrait">Stulpeliai vertikaliame režime</string>
+    <string name="settings_column_count_landscape">Stulpeliai horizontaliame režime</string>
+    <string name="settings_automatic_column_count">Automatiškai</string>
 </resources>
@@ -29,13 +29,13 @@
    <string name="exportFailedTitle">Kunne ikke eksportere</string>
    <string name="exportFailed">Kunne ikke utføre eksport</string>
    <string name="importing">Importerer…</string>
-    <string name="exporting">Exporterer…</string>
+    <string name="exporting">Eksporterer…</string>
    <string name="exportOptionExplanation">Data skrives dit du ønsker det.</string>
    <string name="importOptionFilesystemTitle">Importer fra filsystem</string>
-    <string name="importOptionFilesystemExplanation">Velg spesifikk fil fra filsystemet.</string>
+    <string name="importOptionFilesystemExplanation">Velg en bestemt fil fra filsystemet.</string>
    <string name="importOptionFilesystemButton">Fra filsystem</string>
    <string name="about">Om</string>
-    <string name="app_license">Gemenhetslig fri programvare, lisensiert GPLv3+</string>
+    <string name="app_license">Opphavsrettslig 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="selectBarcodeTitle">Velg strekkode</string>
@@ -48,7 +48,7 @@
    <string name="settings_dark_theme">Mørk</string>
    <string name="settings_light_theme">Lys</string>
    <string name="settings_system_theme">System</string>
-    <string name="settings_theme">Drakt</string>
+    <string name="settings_theme">Tema</string>
    <string name="app_copyright_old">Basert på Kundekortknippe
 \nopphavsrett 2016–2020 Branden Archer</string>
    <string name="failedParsingImportUriError">Kunne ikke tolke importerings-URI</string>
@@ -132,10 +132,10 @@
        <item quantity="one"><xliff:g>%d</xliff:g> valgt</item>
        <item quantity="other"><xliff:g>%d</xliff:g> valgt</item>
    </plurals>
-    <string name="deleteConfirmation">Slett dette kortet for godt?</string>
+    <string name="deleteConfirmation">Slette dette kortet for godt?</string>
    <plurals name="deleteCardsConfirmation">
-        <item quantity="one">Slett dette <xliff:g>%d</xliff:g> kortet for godt\?</item>
-        <item quantity="other">Slett disse <xliff:g>%d</xliff:g> kortene for godt\?</item>
+        <item quantity="one">Slette dette <xliff:g>%d</xliff:g> kortet for godt?</item>
+        <item quantity="other">Slette disse <xliff:g>%d</xliff:g> kortene for godt?</item>
    </plurals>
    <string name="turn_flashlight_on">Skru på lommelykten</string>
    <string name="turn_flashlight_off">Skru av lommelykten</string>
@@ -301,4 +301,8 @@
    <string name="copy_value">Kopieer waarde</string>
    <string name="back">Terug</string>
    <string name="barcodeEncoding">Barcodecodering</string>
+    <string name="change_settings">Verander instellingen</string>
+    <string name="settings_disable_nfc_while_viewing_card">Pauzeer NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Pauzeert NFC om te voorkomen dat NFC-betalingen activeren tijdens het bekijken van een kaart</string>
+    <string name="nfc_blocked_while_viewing_card">NFC is gepauzeerd</string>
 </resources>
@@ -24,7 +24,7 @@
    <string name="failedParsingImportUriError">Nie można przeanalizować identyfikatora importu URL</string>
    <string name="importExport">Import/eksport</string>
    <string name="exportName">Eksportuj</string>
-    <string name="importExportHelp">Kopie zapasowe umożliwiają przeniesienie danych na inne urządzenie.</string>
+    <string name="importExportHelp">Kopie zapasowe umożliwiają przeniesienie danych na inne urządzenie</string>
    <string name="importSuccessfulTitle">Zaimportowano</string>
    <string name="importFailedTitle">Importowanie nie powiodło się</string>
    <string name="importFailed">Nie udało się zaimportować</string>
@@ -59,7 +59,7 @@
    <string name="starImage">Gwiazdka ulubionych</string>
    <string name="app_copyright_old">Na podstawie Loyalty Card Keychain
 \nWszelkie prawa zastrzeżone © 2016–2020 Branden Archer</string>
-    <string name="exportOptionExplanation">Dane zostaną zapisane w wybranym przez ciebie miejscu.</string>
+    <string name="exportOptionExplanation">Dane zostaną zapisane w wybranym przez ciebie miejscu</string>
    <string name="unstar">Usuń z ulubionych</string>
    <string name="star">Dodaj do ulubionych</string>
    <string name="noBarcode">Brak kodu kreskowego</string>
@@ -123,7 +123,7 @@
    <string name="leaveWithoutSaveTitle">Wyjdź</string>
    <string name="moveDown">Przesuń w dół</string>
    <string name="moveUp">Przesuń w górę</string>
-    <string name="failedOpeningFileManager">Nie można otworzyć menadżera plików.</string>
+    <string name="failedOpeningFileManager">Nie można otworzyć menadżera plików</string>
    <plurals name="groupCardCount">
        <item quantity="one"><xliff:g>%d</xliff:g> karta</item>
        <item quantity="few"><xliff:g>%d</xliff:g> karty</item>
@@ -199,7 +199,7 @@
    <string name="unarchive">Cofnij archiwizację</string>
    <string name="archived">Karta zarchiwizowana</string>
    <string name="unarchived">Karta niezarchiwizowana</string>
-    <string name="failedLaunchingPhotoPicker">Nie można odnaleźć obsługiwanej galerii.</string>
+    <string name="failedLaunchingPhotoPicker">Nie można odnaleźć obsługiwanej galerii</string>
    <string name="previousCard">Poprzedni</string>
    <string name="nextCard">Następny</string>
    <plurals name="groupCardCountWithArchived">
@@ -311,4 +311,6 @@
    <string name="copy_value">Kopiuj wartość</string>
    <string name="copied_to_clipboard">Skopiowano do schowka</string>
    <string name="nothing_to_copy">Nie znaleziono wartości</string>
+    <string name="back">Wstecz</string>
+    <string name="barcodeEncoding">Kodowanie kodów kreskowych</string>
 </resources>
@@ -307,4 +307,8 @@
    <string name="nothing_to_copy">Nenhum valor encontrado</string>
    <string name="barcodeEncoding">codificação de código de barras</string>
    <string name="back">Voltar</string>
+    <string name="settings_disable_nfc_while_viewing_card">Pausar NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Suspende a tecnologia NFC para impedir que pagamentos NFC sejam acionados enquanto o cartão estiver sendo visualizado</string>
+    <string name="nfc_blocked_while_viewing_card">NFC está pausado</string>
+    <string name="change_settings">Alterar configurações</string>
 </resources>
@@ -305,4 +305,10 @@
    <string name="copy_value">Copiar valor</string>
    <string name="copied_to_clipboard">Copiado para a área de transferência</string>
    <string name="nothing_to_copy">Nenhum valor encontrado</string>
+    <string name="barcodeEncoding">Codificação de códigos de barras</string>
+    <string name="back">Voltar</string>
+    <string name="settings_disable_nfc_while_viewing_card">Pausar NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Pausa NFC para evitar que pagamentos de NFC sejam acionados enquanto visualiza um cartão</string>
+    <string name="nfc_blocked_while_viewing_card">NFC está pausado</string>
+    <string name="change_settings">Alterar configurações</string>
 </resources>
@@ -306,4 +306,8 @@
    <string name="nothing_to_copy">Nenhum valor encontrado</string>
    <string name="barcodeEncoding">codificação de código de barras</string>
    <string name="back">Voltar</string>
+    <string name="settings_disable_nfc_while_viewing_card">Pausar NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Pausa NFC para evitar que pagamentos de NFC sejam acionados enquanto visualiza um cartão</string>
+    <string name="nfc_blocked_while_viewing_card">NFC está pausado</string>
+    <string name="change_settings">Alterar configurações</string>
 </resources>
@@ -313,4 +313,8 @@
    <string name="nothing_to_copy">Значение не найдено</string>
    <string name="barcodeEncoding">Кодировка штрих-кода</string>
    <string name="back">Назад</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Приостанавливать работу NFC для предотвращения срабатывание NFC-платежей при просмотре карты</string>
+    <string name="settings_disable_nfc_while_viewing_card">Отключать NFC</string>
+    <string name="nfc_blocked_while_viewing_card">NFC приостановлен</string>
+    <string name="change_settings">Изменить настройки</string>
 </resources>
@@ -305,4 +305,10 @@
    <string name="copy_value">Kopírovať hodnotu</string>
    <string name="copied_to_clipboard">Skopírované do schránky</string>
    <string name="nothing_to_copy">Nenašla sa žiadna hodnota</string>
+    <string name="barcodeEncoding">Kódovanie čiarového kódu</string>
+    <string name="back">Späť</string>
+    <string name="settings_disable_nfc_while_viewing_card">Pozastaviť NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Pozastaví NFC pre zabránenie spustenia NFC platieb pri zobrazovaní karty</string>
+    <string name="nfc_blocked_while_viewing_card">NFC je pozastavené</string>
+    <string name="change_settings">Zmenit nastavenie</string>
 </resources>
@@ -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_add">Dodaj</string>
    <string name="action_search">Pretraga</string>
-    <string name="noGiftCards">Klikni + plus znak da dodaš karticu, ili je uvezi pomoću ⋮ menija.</string>
+    <string name="noGiftCards">Klikni + plus znak da dodaš karticu, ili je uvezi pomoću ⋮ menija</string>
    <string name="storeName">Ime</string>
    <string name="cardId">Broj kartice</string>
    <string name="star">Dodaj u omiljene</string>
@@ -27,10 +27,10 @@
    <string name="cardShortcut">Prečica kartice</string>
    <string name="noCardsMessage">Prvo dodaj karticu</string>
    <string name="noCardExistsError">Nije moguće pronaći tu karticu</string>
-    <string name="failedParsingImportUriError">Nije moguće obraditi uvozni URI</string>
-    <string name="importExport">Uvoz/Izvoz</string>
+    <string name="failedParsingImportUriError">Nije moguće obraditi uvozni URL</string>
+    <string name="importExport">Uvoz/izvoz</string>
    <string name="exportName">Izvoz</string>
-    <string name="importExportHelp">Pravljenje rezervnih kopija podataka omogućava premeštanje na drugi uređaj.</string>
+    <string name="importExportHelp">Pravljenje rezervnih kopija podataka omogućava premeštanje na drugi uređaj</string>
    <string name="importSuccessfulTitle">Uvezeno</string>
    <string name="importFailedTitle">Uvoz nije uspeo</string>
    <string name="importFailed">Nije moguće izvršiti uvoz</string>
@@ -43,8 +43,8 @@
    <string name="noBarcode">Nema bar-koda</string>
    <string name="scanCardBarcode">Skeniraj bar-kod</string>
    <string name="barcodeImageDescriptionWithType">Fotografija <xliff:g>%s</xliff:g> bar-koda</string>
-    <string name="exportOptionExplanation">Podaci će biti sačuvani na lokaciji po tvom izboru.</string>
-    <string name="importOptionFilesystemExplanation">Odaberi određenu datoteku iz sistema za upravljanje datotekama.</string>
+    <string name="exportOptionExplanation">Podaci će biti sačuvani na lokaciji po tvom izboru</string>
+    <string name="importOptionFilesystemExplanation">Odaberi određenu datoteku iz sistema za upravljanje datotekama</string>
    <string name="importOptionFilesystemTitle">Uvezi iz sistema za upravljanje datotekama</string>
    <string name="importOptionFilesystemButton">Iz sistema za upravljanje datotekama</string>
    <string name="about">O aplikaciji</string>
@@ -68,7 +68,7 @@
    <string name="importSuccessful">Podaci uvezeni</string>
    <string name="exportSuccessful">Podaci izvezeni</string>
    <string name="enter_group_name">Unesite ime grupe</string>
-    <string name="noGroups">Klikni + plus znak da dodaš grupe za kategorizaciju.</string>
+    <string name="noGroups">Klikni + plus znak da dodaš grupe za kategorizaciju</string>
    <string name="noGroupCards">Ova grupa je prazna</string>
    <plurals name="groupCardCount">
        <item quantity="one"><xliff:g>%d</xliff:g> kartica</item>
@@ -99,11 +99,9 @@
    <string name="importCatima">Uvezi iz Catime</string>
    <string name="importFidme">Uvoz iz FidMe</string>
    <string name="importLoyaltyCardKeychain">Uvezi iz aplikacije Loyalty Card Keychain</string>
-    <string name="importLoyaltyCardKeychainMessage">Odaberi svoj <i>LoyaltyCardKeychain.csv</i> izvoz iz aplikacije Loyalty Card Keychain za uvoz.
-\nKreiraj ga iz menija \"Import/Export\" u aplikaciji Loyalty Card Keychain klikom na \"Export\".</string>
+    <string name="importLoyaltyCardKeychainMessage">Odaberi svoj izvoz iz aplikacije Loyalty Card Keychain za uvoz. \nKreiraj ga iz menija \"Import/Export\" u aplikaciji Loyalty Card Keychain klikom na \"Export\".</string>
    <string name="importVoucherVault">Uvoz iz Voucher Vault</string>
-    <string name="importVoucherVaultMessage">Odaberi svoj <i>vouchervault.json</i> izvoz iz Voucher Vault za uvoz.
-\nKreiraj ga pritiskom na \"Export\" u Voucher Vault aplikaciji.</string>
+    <string name="importVoucherVaultMessage">Odaberi svoj izvoz iz Voucher Vault za uvoz. \nKreiraj ga pritiskom na \"Export\" u Voucher Vault aplikaciji.</string>
    <string name="barcodeId">Vrednost bar-koda</string>
    <string name="sameAsCardId">Isti kao broj kartice</string>
    <string name="setBarcodeId">Podesi vrednost bar-koda</string>
@@ -119,7 +117,7 @@
    <string name="yes">Da</string>
    <string name="exportPassword">Podesi lozinku da bi zaštitio svoj izvoz (opciono)</string>
    <string name="exportPasswordHint">Unesi lozinku</string>
-    <string name="failedGeneratingShareURL">Nije moguće generisati URL koji se može podeliti. Molim te da prijaviš ovo developeru.</string>
+    <string name="failedGeneratingShareURL">Nije moguće generisati URL koji se može podeliti.</string>
    <string name="turn_flashlight_on">Uključi blic</string>
    <string name="turn_flashlight_off">Isključi blic</string>
    <string name="settings_locale">Jezik</string>
@@ -155,7 +153,7 @@
    <string name="unarchive">Ukloni iz arhive</string>
    <string name="unarchived">Kartica uklonjena iz arhive</string>
    <string name="archived">Kartica dodata u arhivu</string>
-    <string name="failedLaunchingPhotoPicker">Nije moguće pronaći podržanu galerija aplikaciju</string>
+    <string name="failedLaunchingPhotoPicker">Nije moguće pronaći podržan birač fotografija</string>
    <string name="previousCard">Prethodna</string>
    <string name="nextCard">Sledeća</string>
    <string name="failedToOpenUrl">Prvo instalirajte internet pregledač</string>
@@ -171,7 +169,7 @@
    <string name="height">Visina</string>
    <string name="switchToFrontImage">Prebaci na prednju fotografiju</string>
    <string name="switchToBarcode">Prebaci na bar-kod</string>
-    <string name="openFrontImageInGalleryApp">Otvori prednju fotografiju u galerija aplikaciji</string>
+    <string name="openFrontImageInGalleryApp">Otvori prednju fotografiju u prikazivaču fotografija</string>
    <string name="setBarcodeHeight">Postavi visinu bar-koda</string>
    <string name="donate">Doniraj</string>
    <string name="icon_header_click_text">Dugi pritisak za izmenu naslovne fotografije</string>
@@ -191,7 +189,7 @@
        <item quantity="few"><xliff:g>%d</xliff:g> izabrane</item>
        <item quantity="other"><xliff:g>%d</xliff:g> izabranih</item>
    </plurals>
-    <string name="noGiftCardsGroup">Kreirajte par kartica, a zatim ih ovde dodeli grupi.</string>
+    <string name="noGiftCardsGroup">Kreiraj par kartica, a zatim ih ovde dodeli grupi.</string>
    <string name="noMatchingGiftCards">Nema rezultata. Pokušaj da promeniš pretragu.</string>
    <string name="note">Napomena</string>
    <plurals name="deleteCardsTitle">
@@ -208,8 +206,8 @@
    <string name="app_license">Kopileftovani slobodni softver, licenciran GPLv3+</string>
    <string name="about_title_fmt">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_libraries">Slobodne biblioteke trećih strana: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources">Slobodni resursi trećih strana: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Biblioteke trećih strana: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Resursi trećih strana: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="settings_keep_screen_on">Drži ekran uključen</string>
    <string name="settings_keep_screen_on_summary">Onemogućava vremensko ograničenje gašenja ekrana dok gledate karticu</string>
    <string name="settings_disable_lockscreen_while_viewing_card_summary">Onemogućava zaključavanje ekrana dok gledate karticu</string>
@@ -217,7 +215,7 @@
    <string name="groups">Grupe</string>
    <string name="group_edit">Izmeni grupu</string>
    <string name="group_updated">Grupa ažurirana</string>
-    <string name="failedOpeningFileManager">Prvo instaliraj menadžer datoteka.</string>
+    <string name="failedOpeningFileManager">Otvaranje menadžera datoteka nije uspelo.</string>
    <string name="editGroup">Izmena grupe: <xliff:g>%s</xliff:g></string>
    <string name="expiryStateSentence">Ističe: <xliff:g>%s</xliff:g></string>
    <string name="expiryStateSentenceExpired">Istekla: <xliff:g>%s</xliff:g></string>
@@ -233,10 +231,8 @@
    <string name="never">Nikad</string>
    <string name="chooseExpiryDate">Odaberi datum isteka</string>
    <string name="noBarcodeFound">Nije pronađen bar-kod</string>
-    <string name="importCatimaMessage">Odaberi svoj <i>catima.zip</i> koji želiš da uvezeš.
-\nMožeš da ga kreiraš u Catima aplikaciji koju prenosiš iz menija Uvoz/Izvoz aplikacije pritiskom na izvoz.</string>
-    <string name="importFidmeMessage">Odaberi svoj <i>fidme-export-request-xxxxxx.zip</i> izvoz iz FidMe za uvoz, a zatim ručno izaberite tipove bar-kodova.
-\nKreirajte ga iz svog FidMe profila tako što ćeš izabrati \"Data Protection\", a zatim pritisnuti \"Extract my data first\".</string>
+    <string name="importCatimaMessage">Odaberi svoj export iz Carine radi importa.\nMožeš da ga kreiraš u Catima aplikaciji koju prenosiš iz menija Uvoz/Izvoz u drugoj Catima aplikaciji pritiskom na Izvoz.</string>
+    <string name="importFidmeMessage">Odaberi svoj izvoz iz FidMe za uvoz, a zatim ručno izaberite tipove bar-kodova.\nKreirajte ga iz svog FidMe profila tako što ćeš izabrati \"Data Protection\", a zatim pritisnuti \"Extract my data first\".</string>
    <string name="backImageDescription">Zadnja fotografija kartice</string>
    <string name="setBackImage">Postavi zadnju fotografiju</string>
    <string name="passwordRequired">Unesi lozinku</string>
@@ -253,7 +249,7 @@
    <string name="include_if_asking_support">Ako želiš da zatražiš podršku, ubaci sledeće informacije:</string>
    <string name="newBalanceSentence">Novo stanje: <xliff:g>%s</xliff:g></string>
    <string name="switchToBackImage">Prebaci na zadnju fotografiju</string>
-    <string name="openBackImageInGalleryApp">Otvori zadnju fotografiju u galerija aplikaciji</string>
+    <string name="openBackImageInGalleryApp">Otvori zadnju fotografiju u prikazivaču fotografija</string>
    <string name="settings_category_title_cards">Pregled kartica</string>
    <string name="addWithoutBarcode">Dodaj karticu bez bar-koda</string>
    <string name="enter_card_id">Unesite broj ili tekst sa kartice</string>
@@ -262,7 +258,7 @@
    <string name="field_must_not_be_empty">Ovo polje ne sme biti prazno</string>
    <string name="manually_enter_barcode_instructions">Unesi broj ili tekst sa kartice i pritisnite bar-kod koji liči na onaj koji je na kartici.</string>
    <string name="add_manually_warning_title">Skeniranje se preporučuje</string>
-    <string name="add_manually_warning_message">Za neke prodavnice, vrednost bar-koda može da se razlikuje od broja napisanog na kartici. Zbog toga, ručno unešeni bar-kod možda neće uvek funkcionisati. Toplo se preporučuje da umesto toga skeniraš bar-kod kamerom. Da li ipak želiš da nastaviš?</string>
+    <string name="add_manually_warning_message">Za neke kartice, vrednost bar-koda može da se razlikuje od broja napisanog na kartici. Zbog toga, ručno unešeni bar-kod možda neće uvek funkcionisati. Preporučujemo da umesto toga skeniraš bar-kod kamerom. Da li ipak želiš da nastaviš?</string>
    <string name="continue_">Nastavi</string>
    <string name="spend">Potroši</string>
    <string name="receive">Primi</string>
@@ -278,7 +274,7 @@
    <string name="pageWithNumber">Strana <xliff:g>%d</xliff:g></string>
    <string name="noCameraFoundGuideText">Čini se da tvoj uređaj nema kameru. Ako je ima, pokušaj da ponovo pokreneš uređaj. U suprotnom, koristi dugme Više opcija, koje se nalazi ispod, da bi dodao bar-kod na drugi način.</string>
    <string name="sort_by_valid_from">Važi od</string>
-    <string name="generic_error_please_retry">Izvinite, nešto je pošlo naopako, molimo Vas pokušajte ponovo...</string>
+    <string name="generic_error_please_retry">Došlo je do greške</string>
    <string name="width">Širina</string>
    <string name="setBarcodeWidth">Postavi širinu barkoda</string>
    <string name="settings_use_volume_keys_navigation">Promeni kartice koristeći dugmad za zvuk</string>
@@ -295,7 +291,20 @@
    <string name="settings_column_count_2">2</string>
    <string name="settings_column_count_3">3</string>
    <string name="settings_column_count_4">4</string>
-    <string name="addFromPkpass">Izaberi \"Passbook\" dokument (.pkpass)</string>
+    <string name="addFromPkpass">Izaberi \"Passbook\" dokument (.pkpass/.pkpasses)</string>
    <string name="card_list_widget_name">Lista kartica</string>
    <string name="card_list_widget_empty">Nakon što dodate neke kartice lojalnosti u Catima, one će se pojaviti ovde. Ako imate kartice, uverite se da nisu sve arhivirane.</string>
+    <string name="cardWithNumber">Kartica <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Kartica <xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>)</string>
+    <string name="pleaseDoNotRotateTheDevice">Molimo ne rotiraj uređaj, jer će to poništiti radnju</string>
+    <string name="acra_catima_has_crashed">Nažalost, aplikacija <xliff:g id="app_name">%s</xliff:g> se neočekivano zaustavila. Molimo te da nam pomogneš u popravljanju ovog problema tako što ćeš nam poslati izveštaj o grešci.</string>
+    <string name="acra_explain_crash">Ukoliko je moguće, molimo te da dodaš još detalja o tome šta si radio ovde:</string>
+    <string name="acra_crash_email_subject"><xliff:g id="app_name">%s</xliff:g> izveštaj o grešci</string>
+    <string name="pref_enable_acra">Pitaj za slanje izveštaja o grešci</string>
+    <string name="pref_enable_acra_summary">Kada je omogućeno, bićeš upitan da prijaviš grešku kada do nje dođe. Izveštaji o grešci nikada neće biti poslati automatski.</string>
+    <string name="copy_value">Kopiraj vrednost</string>
+    <string name="copied_to_clipboard">Kopiramo u privremenu memoriju</string>
+    <string name="nothing_to_copy">Nije pronađena vrednost</string>
+    <string name="barcodeEncoding">Enkodiranje bar-koda</string>
+    <string name="back">Nazad</string>
 </resources>
@@ -79,7 +79,7 @@
    <string name="settings_column_count_7">7</string>
    <string name="spend">செலவு</string>
    <string name="unsupportedFile">இந்த கோப்பு ஆதரிக்கப்படவில்லை</string>
-    <string name="generic_error_please_retry">மன்னிக்கவும், ஏதோ தவறு நடந்தது, தயவுசெய்து மீண்டும் முயற்சிக்கவும் ...</string>
+    <string name="generic_error_please_retry">பிழை ஏற்பட்டது</string>
    <string name="noMatchingGiftCards">முடிவுகள் இல்லை. உங்கள் தேடலை மாற்ற முயற்சிக்கவும்.</string>
    <string name="edit">தொகு</string>
    <string name="deleteTitle">அட்டையை நீக்கு</string>
@@ -145,7 +145,7 @@
    <string name="unsupportedBarcodeType">இந்த பார்கோடு வகையை இன்னும் காட்ட முடியாது. பயன்பாட்டின் பின்னர் பதிப்பில் இது ஆதரிக்கப்படலாம்.</string>
    <string name="wrongValueForBarcodeType">தேர்ந்தெடுக்கப்பட்ட பார்கோடு வகைக்கு மதிப்பு செல்லுபடியாகாது</string>
    <string name="intent_import_card_from_url_share_multiple_text">சில அட்டைகளை உங்களுடன் பகிர்ந்து கொள்ள விரும்புகிறேன்</string>
-    <string name="importVoucherVaultMessage">உங்கள் <i> vouchervault.json </i> வவுச்சர் பெட்டகத்திலிருந்து இறக்குமதி செய்ய ஏற்றுமதி என்பதைத் தேர்ந்தெடுக்கவும்.\n முதலில் வவுச்சர் வால்ட்டில் ஏற்றுமதியை அழுத்துவதன் மூலம் அதை உருவாக்கவும்.</string>
+    <string name="importVoucherVaultMessage">இறக்குமதி செய்ய வவுச்சர் வால்ட்டிலிருந்து உங்கள் ஏற்றுமதியைத் தேர்ந்தெடுக்கவும். \nவவுச்சர் வால்ட்டில் ஏற்றுமதி என்பதை அழுத்தி உருவாக்கவும்.</string>
    <string name="frontImageDescription">முன் படம்</string>
    <string name="updateBarcodeQuestionTitle">பார்கோடு மதிப்பைப் புதுப்பிக்கவா?</string>
    <string name="updateBarcodeQuestionText">நீங்கள் ஐடியை மாற்றினீர்கள். அதே மதிப்பைப் பயன்படுத்த பார்கோடு புதுப்பிக்க விரும்புகிறீர்களா?</string>
@@ -154,7 +154,7 @@
    <string name="passwordRequired">கடவுச்சொல்லை உள்ளிடவும்</string>
    <string name="exportPassword">உங்கள் ஏற்றுமதியைப் பாதுகாக்க கடவுச்சொல்லை அமைக்கவும் (விரும்பினால்)</string>
    <string name="exportPasswordHint">கடவுச்சொல்லை உள்ளிடவும்</string>
-    <string name="failedGeneratingShareURL">பகிரக்கூடிய முகவரி ஐ உருவாக்க முடியவில்லை. இதை புகாரளிக்கவும்.</string>
+    <string name="failedGeneratingShareURL">பகிரக்கூடிய முகவரி ஐ உருவாக்க முடியவில்லை</string>
    <string name="turn_flashlight_on">ஒளிரும் விளக்கை இயக்கவும்</string>
    <string name="turn_flashlight_off">ஒளிரும் விளக்கை அணைக்கவும்</string>
    <string name="settings_locale">மொழி</string>
@@ -187,7 +187,7 @@
    <string name="unarchive">அன்கான்</string>
    <string name="archived">அட்டை காப்பகப்படுத்தப்பட்டது</string>
    <string name="unarchived">அட்டை பதிக்கப்படாதது</string>
-    <string name="failedLaunchingPhotoPicker">உதவி கேலரி பயன்பாட்டைக் கண்டுபிடிக்க முடியவில்லை</string>
+    <string name="failedLaunchingPhotoPicker">ஆதரிக்கப்படும் படத் தேர்வியைக் கண்டறிய முடியவில்லை</string>
    <string name="previousCard">முந்தைய</string>
    <string name="failedToOpenUrl">முதலில் ஒரு வலை உலாவியை நிறுவவும்</string>
    <string name="welcome">கேட்டிமாவுக்கு வருக</string>
@@ -201,8 +201,8 @@
    <string name="switchToFrontImage">முன் படத்திற்கு மாறவும்</string>
    <string name="switchToBackImage">பின் படத்திற்கு மாறவும்</string>
    <string name="switchToBarcode">பார்கோடு மாறவும்</string>
-    <string name="openFrontImageInGalleryApp">கேலரி பயன்பாட்டில் முன் படத்தைத் திறக்கவும்</string>
-    <string name="openBackImageInGalleryApp">கேலரி பயன்பாட்டில் படத்தைத் திறக்கவும்</string>
+    <string name="openFrontImageInGalleryApp">இமேச் வியூவர் ஆப்சில் முன் படத்தைத் திறக்கவும்</string>
+    <string name="openBackImageInGalleryApp">இமேச் வியூவர் ஆப்சில் மீண்டும் படத்தைத் திறக்கவும்</string>
    <string name="setBarcodeHeight">பார்கோடு உயரத்தை அமைக்கவும்</string>
    <string name="donate">நன்கொடை</string>
    <string name="icon_header_click_text">சிறுபடத்தைத் திருத்த நீண்ட அழுத்தவும்</string>
@@ -234,16 +234,16 @@
    <string name="continue_">தொடரவும்</string>
    <string name="receive">பெறுங்கள்</string>
    <string name="amountParsingFailed">தவறான தொகை</string>
-    <string name="add_manually_warning_message">சில கடைகளுக்கு, பார்கோடு மதிப்பு அட்டையில் எழுதப்பட்ட எண்ணிலிருந்து வேறுபடுகிறது. இதன் காரணமாக, ஒரு பார்கோடு கைமுறையாக நுழைவது எப்போதும் வேலை செய்யாது. அதற்கு பதிலாக உங்கள் கேமராவுடன் பார்கோடு ச்கேன் செய்ய கடுமையாக பரிந்துரைக்கப்படுகிறது. நீங்கள் இன்னும் தொடர விரும்புகிறீர்களா?</string>
+    <string name="add_manually_warning_message">சில கார்டுகளுக்கு, கார்டில் எழுதப்பட்ட எண்ணிலிருந்து பார்கோடு மதிப்பு வேறுபடும். இதன் காரணமாக, பார்கோடு கைமுறையாக உள்ளிடுவது எப்போதும் வேலை செய்யாது. அதற்கு பதிலாக உங்கள் கேமரா மூலம் பார்கோடை வருடு செய்ய பரிந்துரைக்கப்படுகிறது. நீங்கள் இன்னும் தொடர விரும்புகிறீர்களா?</string>
    <string name="addFromPdfFile">PDF கோப்பைத் தேர்ந்தெடுக்கவும்</string>
    <string name="errorReadingFile">கோப்பைப் படிக்க முடியவில்லை</string>
-    <string name="failedLaunchingFileManager">உதவி கோப்பு மேலாளரைக் கண்டுபிடிக்க முடியவில்லை</string>
+    <string name="failedLaunchingFileManager">ஆதரிக்கப்படும் கோப்பு மேலாளரைக் கண்டுபிடிக்க முடியவில்லை</string>
    <string name="multipleBarcodesFoundPleaseChooseOne">கண்டுபிடிக்கப்பட்ட பார்கோடுகளில் எது நீங்கள் பயன்படுத்த விரும்புகிறீர்கள்?</string>
    <string name="noCameraFoundGuideText">உங்கள் சாதனத்தில் கேமரா இருப்பதாகத் தெரியவில்லை. அவ்வாறு இருந்தால், சாதனத்தை மறுதொடக்கம் செய்ய முயற்சிக்கவும். இல்லையெனில், பார்கோடை மற்றொரு வழியில் சேர்க்க கீழே உள்ள கூடுதல் விருப்பங்கள் பொத்தானைப் பயன்படுத்தவும்.</string>
    <string name="importCancelled">இறக்குமதி ரத்து செய்யப்பட்டது</string>
    <string name="exportCancelled">ஏற்றுமதி ரத்து செய்யப்பட்டது</string>
    <string name="useBackImage">பின் படத்தைப் பயன்படுத்தவும்</string>
-    <string name="addFromPkpass">பாச் புக் கோப்பைத் தேர்ந்தெடுக்கவும் (.pkpass)</string>
+    <string name="addFromPkpass">பாச்புக் கோப்பைத் தேர்ந்தெடுக்கவும் (.pkpass / .pkpasses)</string>
    <string name="useFrontImage">முன் படத்தைப் பயன்படுத்தவும்</string>
    <plurals name="deleteCardsTitle">
        <item quantity="one"><xliff:g>%d</xliff:g> அட்டை நீக்கு</item>
@@ -283,11 +283,11 @@
    <string name="app_resources">மூன்றாம் தரப்பு வளங்கள்: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="groupsList">குழுக்கள்: <xliff:g>%s</xliff:g></string>
    <string name="sort_by_valid_from">இருந்து செல்லுபடியாகும்</string>
-    <string name="setBarcodeWidth">பட்டைகுறி அகலம் அமை</string>
+    <string name="setBarcodeWidth">பார்கோடு அகலத்தை அமைக்கவும்</string>
    <string name="width">அகலம்</string>
    <string name="card_list_widget_name">அட்டை பட்டியல்</string>
    <string name="card_list_widget_empty">கேட்டிமாவில் நீங்கள் விசுவாச அட்டைகளை சேர்த்த பிறகு, அவை இங்கு தோன்றும். அட்டைகள் காப்பகப்படுத்த படவில்லை என உறுதி செய்க.</string>
-    <string name="cardWithNumber">அட்டை<xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumber">அட்டை <xliff:g>%d</xliff:g></string>
    <string name="cardWithNumberAndLocale">அட்டை<xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>)</string>
    <string name="pleaseDoNotRotateTheDevice">தயவுசெய்து சாதனத்தை சுழற்றாதீர்கள், இது செயலை ரத்து செய்யும்.</string>
    <string name="acra_catima_has_crashed">மன்னிக்கவும், <xliff:g id="app_name">%s</xliff:g> செயலி செயலிழந்துள்ளது. தயவுசெய்து பிழை அறிக்கையை அனுப்பி, இந்த பிரச்சினையை சரிசெய்ய எங்களுக்கு உதவுங்கள்.</string>
@@ -295,4 +295,9 @@
    <string name="acra_crash_email_subject"><xliff:g id="app_name">%s</xliff:g> செயலிழப்பு அறிக்கை</string>
    <string name="pref_enable_acra">செயலிழப்பு அறிக்கைகளை அனுப்ப வேண்டுமா</string>
    <string name="pref_enable_acra_summary">இது இயக்கப்பட்டால், செயலி செயலிழக்கும் போது அதைப் பற்றிய அறிக்கையை அனுப்பும்படி உங்களிடம் கேட்கப்படும். செயலிழப்பு அறிக்கைகள் ஒருபோதும் தானாக அனுப்பப்படமாட்டாது.</string>
+    <string name="copy_value">நகல் மதிப்பு</string>
+    <string name="copied_to_clipboard">இடைநிலைப்பலகைக்கு நகலெடுக்கப்பட்டது</string>
+    <string name="nothing_to_copy">மதிப்பு இல்லை</string>
+    <string name="barcodeEncoding">பார்கோடு குறியாக்கம்</string>
+    <string name="back">பின்</string>
 </resources>
@@ -301,4 +301,8 @@
    <string name="nothing_to_copy">Değer bulunamadı</string>
    <string name="barcodeEncoding">Barkod kodlaması</string>
    <string name="back">Geri</string>
+    <string name="settings_disable_nfc_while_viewing_card">NFC\'yi duraklat</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Kart görüntülenirken NFC ödemelerinin tetiklenmesini önlemek için NFC işlevini duraklatır</string>
+    <string name="nfc_blocked_while_viewing_card">NFC duraklatıldı</string>
+    <string name="change_settings">Ayarları değiştir</string>
 </resources>
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
    <string name="translate_platform">trên Weblate</string>
-    <string name="failedOpeningFileManager">Cài đặt trình quản lý tập tin trước đã.</string>
+    <string name="failedOpeningFileManager">Không thể mở trình quản lý tập tin</string>
    <string name="intent_import_card_from_url_share_multiple_text">Tôi muốn chia sẻ vài cái thẻ với bạn</string>
    <string name="card_id_must_not_be_empty">ID thẻ không thể bỏ trống</string>
    <string name="duplicateCard">Tạo bản sao</string>
@@ -21,12 +21,12 @@
    <string name="takePhoto">Chụp ảnh</string>
    <string name="storeName">Tên</string>
    <string name="validFromDate">Có hiệu lực từ</string>
-    <string name="cameraPermissionDeniedTitle">Không sử dụng được camera</string>
-    <string name="wrongValueForBarcodeType">Giá trị cho loại mã vạch này không hợp lệ</string>
+    <string name="cameraPermissionDeniedTitle">Không thể truy cập camera</string>
+    <string name="wrongValueForBarcodeType">Giá trị không hợp lệ cho loại mã vạch đã chọn</string>
    <string name="expiryDate">Ngày hết hạn</string>
    <string name="currency">Tiền tệ</string>
    <string name="welcome">Chào mừng tới Catima</string>
-    <string name="failedParsingImportUriError">Không thể phân tích URI được cung cấp</string>
+    <string name="failedParsingImportUriError">Không thể phân tích URI đã nhập</string>
    <string name="exporting">Đang xuất dữ liệu…</string>
    <string name="group_edit">Sửa nhóm</string>
    <string name="debug_version_fmt">Phiên bản: <xliff:g id="version">%s</xliff:g></string>
@@ -54,11 +54,10 @@
    <string name="cardId">ID thẻ</string>
    <string name="settings_disable_lockscreen_while_viewing_card_summary">Tắt tính năng khóa màng hình khi đang xem thẻ</string>
    <string name="action_more_options">Tùy chọn mở rộng</string>
-    <string name="exportOptionExplanation">Dữ liệu sẽ được ghi vào vị trí mà bạn chọn.</string>
+    <string name="exportOptionExplanation">Dữ liệu sẽ được ghi vào vị trí mà bạn chọn</string>
    <string name="app_copyright_old">Dựa trên Loyalty Card Keychain
 \nbản quyền © 2016–2020 Branden Archer</string>
-    <string name="importVoucherVaultMessage">Chọn <i>vouchervault.json</i> được xuất từ Voucher Vault để nhập liệu.
-\nTập tin này có thể tạo bằng cách bấm Export trong ứng dụng Voucher Vault.</string>
+    <string name="importVoucherVaultMessage">Chọn tập tin đã xuất từ Voucher Vault để nhập liệu. \nTạo tập tin này bằng cách bấm Export trong ứng dụng Voucher Vault.</string>
    <string name="importFailed">Không thể nhập dữ liệu</string>
    <string name="chooseImportType">Nhập dữ liệu từ</string>
    <string name="frontImageDescription">Ảnh mặt trước</string>
@@ -106,18 +105,18 @@
    <string name="on_google_play">trên CH Play</string>
    <string name="turn_flashlight_off">Tắt đèn pin</string>
    <string name="show_note">Hiện ghi chú</string>
-    <string name="report_error">Báo Lỗi</string>
+    <string name="report_error">Báo lỗi</string>
    <string name="passwordRequired">Xin mời nhập mật khẩu</string>
    <string name="intent_import_card_from_url_share_text">Tôi muốn chia sẻ thẻ với bạn</string>
    <string name="star">Đánh dấu ưa thích</string>
    <string name="addFromImage">Chọn ảnh từ thư viện ảnh</string>
    <string name="reverse">...theo trật tự đảo ngược</string>
    <string name="app_copyright_short">Bản quyền © Sylvia van Os và các cộng sự</string>
-    <string name="importExportHelp">Sao lưu cho phép bạn chuyển dữ liệu của mình đến thiết bị khác.</string>
+    <string name="importExportHelp">Sao lưu cho phép bạn chuyển dữ liệu của mình đến thiết bị khác</string>
    <string name="settings_oled_dark">Nền đen tuyền cho chủ đề tối</string>
    <string name="starred">Ưa thích</string>
    <string name="field_must_not_be_empty">Không được để ô trống</string>
-    <string name="importOptionFilesystemExplanation">Chọn 1 tập tin cụ thể từ hệ thống (filesystem).</string>
+    <string name="importOptionFilesystemExplanation">Chọn 1 tập tin cụ thể từ hệ thống (filesystem)</string>
    <string name="validFromSentence">Hợp lệ từ: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessful">Xuất dữ liệu xong</string>
    <string name="previousCard">Trước</string>
@@ -125,7 +124,7 @@
    <string name="license">Giấy phép</string>
    <string name="newBalanceSentence">Số dư mới: <xliff:g>%s</xliff:g></string>
    <string name="editGroup">Sửa nhóm: <xliff:g>%s</xliff:g></string>
-    <string name="noGroups">Bấm vào dấu cộng + để thêm nhóm cho việc phân loại.</string>
+    <string name="noGroups">Bấm vào dấu cộng + để thêm nhóm cho việc phân loại</string>
    <plurals name="groupCardCountWithArchived">
        <item quantity="other"><xliff:g>%1$d</xliff:g> thẻ (lưu trữ <xliff:g id="archivedCount">%2$d</xliff:g>)</item>
    </plurals>
@@ -137,10 +136,10 @@
    <string name="options">Tùy chọn</string>
    <string name="sendLabel">Gửi…</string>
    <string name="importOptionFilesystemButton">Lấy từ hệ thống</string>
-    <string name="failedGeneratingShareURL">Không tạo được URL chia sẻ. Xin hãy báo cáo sự cố này.</string>
+    <string name="failedGeneratingShareURL">Không tạo được URL để chia sẻ</string>
    <string name="selectColor">Chọn màu</string>
    <string name="setBarcodeHeight">Đặt chiều cao cho mã vạch</string>
-    <string name="privacy_policy">Chính Sách Quyền Riêng Tư</string>
+    <string name="privacy_policy">Chính sách quyền riêng tư</string>
    <string name="enter_group_name">Nhập tên nhóm</string>
    <string name="addCardTitle">Thêm Thẻ</string>
    <string name="exportFailed">Không thể xuất dữ liệu</string>
@@ -149,7 +148,7 @@
    <string name="addManually">Nhập mã vạch thủ công</string>
    <string name="updateBalance">Cập nhật số dư</string>
    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Bản quyền © 2019–<xliff:g>%d</xliff:g> Sylvia van Os và các cộng sự</string>
-    <string name="sort_by_most_recently_used">Sửa dụng gần đây nhất</string>
+    <string name="sort_by_most_recently_used">Sử dụng gần đây nhất</string>
    <string name="noGiftCards">Bấm nút dấu cộng + để thêm thẻ, hoặc nhập dữ liệu từ ⋮ menu</string>
    <string name="importVoucherVault">Nhập dữ liệu từ Voucher Vault</string>
    <string name="barcodeId">Giá trị mã vạch</string>
@@ -164,8 +163,7 @@
    <string name="cameraPermissionRequired">Tác vụ này cần được cấp quyền sử dụng camera…</string>
    <string name="settings_allow_content_provider_read_title">Cho phép ứng dụng khác truy cập vào dữ liệu của tôi</string>
    <string name="updateBarcodeQuestionText">Bạn đã thay đổi ID. Bạn có muốn cập nhật mã vạch dùng chung giá trị này\?</string>
-    <string name="importLoyaltyCardKeychainMessage">Chọn <i>LoyaltyCardKeychain.csv</i> được xuất từ Loyalty Card Keychain để nhập liệu.
-\nTập tin này có thể tạo bằng cách vào menu Import/Export của Loyalty Card Keychain → bấm Export.</string>
+    <string name="importLoyaltyCardKeychainMessage">Chọn tập tin được xuất từ Loyalty Card Keychain để nhập liệu. \nTạo tập tin này bằng cách vào menu Import/Export của Loyalty Card Keychain và bấm Export.</string>
    <string name="settings_light_theme">Sáng</string>
    <string name="moveDown">Kéo xuống</string>
    <string name="importSuccessfulTitle">Nhập dữ liệu xong</string>
@@ -178,7 +176,7 @@
    <string name="scanCardBarcode">Quét Mã Vạch</string>
    <string name="updateBalanceHint">Nhập số lượng</string>
    <string name="action_search">Tìm kiếm</string>
-    <string name="noGiftCardsGroup">Tạo vài thẻ, và phân công chúng vào nhóm này.</string>
+    <string name="noGiftCardsGroup">Tạo vài thẻ, và sắp xếp chúng vào nhóm này</string>
    <string name="on_github">trên Github</string>
    <string name="sort">Sắp Xếp</string>
    <string name="permissionReadCardsLabel">Đọc thẻ Catima</string>
@@ -202,11 +200,11 @@
    <string name="show_archived_cards">Hiện thẻ lưu trữ</string>
    <string name="selectBarcodeTitle">Chọn Mã Vạch</string>
    <string name="importSuccessful">Nhập dữ liệu xong</string>
-    <string name="app_libraries">Thư viện mở từ bên thứ 3: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_libraries">Thư viện mở từ bên thứ ba: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="updateBalanceTitle">Bạn đã chi tiêu hoặc nhận được bao nhiêu?</string>
-    <string name="editCardTitle">Sửa Thẻ</string>
+    <string name="editCardTitle">Sửa thẻ</string>
    <string name="archive">Lưu trữ</string>
-    <string name="app_resources">Tài nguyên mở từ bên thứ 3: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_resources">Tài nguyên mở từ bên thứ ba: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="shortcutSelectCard">Chọn một thẻ</string>
    <string name="accept">Đồng ý</string>
    <string name="noCardsMessage">Thêm danh sách thẻ</string>
@@ -220,15 +218,13 @@
    <plurals name="selectedCardCount">
        <item quantity="other"><xliff:g>%d</xliff:g> đã được chọn</item>
    </plurals>
-    <string name="version_history">Lịch Sử Phiên Bản</string>
+    <string name="version_history">Lịch sử phiên bản</string>
    <string name="note">Ghi chú</string>
-    <string name="importCatimaMessage">Chọn <i>catima.zip</i> được xuất từ Catima để nhập liệu.
-\nTập tin này có thể tạo bằng cách vào menu Nhập/Xuất dữ liệu → bấm Xuất dữ liệu ở ứng dụng Catima khác.</string>
+    <string name="importCatimaMessage">Chọn tập tin được xuất từ Catima để nhập liệu.\nTạo tập tin từ menu Nhập/Xuất dữ liệu ở ứng dụng Catima khác và bấm Xuất dữ liệu.</string>
    <plurals name="balancePoints">
        <item quantity="other"><xliff:g>%s</xliff:g> điểm</item>
    </plurals>
-    <string name="importFidmeMessage">Chọn <i>fidme-export-request-xxxxxx.zip</i> được xuất từ FidMe để nhập liệu, sau đó chọn mã vạch thủ công.
-\nTập tin này có thể tạo bằng cách vào FidMe profile → Data Protection → bấm Extract my data.</string>
+    <string name="importFidmeMessage">Chọn tập tin được xuất từ FidMe để nhập liệu, sau đó chọn thủ công loại mã vạch. \nTạo tập tin này bằng cách vào tài khoản FidMe, chọn Data Protection, rồi bấm Extract my data.</string>
    <string name="action_add">Thêm</string>
    <string name="updateBarcodeQuestionTitle">Cập nhật giá trị cho mã vạch chứ\?</string>
    <string name="deleteTitle">Xóa thẻ</string>
@@ -238,14 +234,14 @@
    <string name="rate_this_app">Đánh giá ứng dụng</string>
    <string name="credits">Ghi nhận</string>
    <string name="app_name">Catima</string>
-    <string name="openFrontImageInGalleryApp">Mở hình ảnh phía trước trong ứng dụng thư viện</string>
+    <string name="openFrontImageInGalleryApp">Mở hình ảnh mặt trước trong ứng dụng thư viện ảnh</string>
    <string name="and_data_usage">và sử dụng dữ liệu</string>
    <string name="show_validity">Hiển thị tính hợp lệ</string>
    <string name="barcodeLongPressMessage">Chỉ có thể mở hình ảnh trong ứng dụng thư viện</string>
    <string name="source_repository">Kho lưu trữ nguồn</string>
    <string name="switchToBackImage">Chuyển sang hình ảnh phía sau</string>
    <string name="switchToFrontImage">Chuyển sang hình ảnh phía trước</string>
-    <string name="openBackImageInGalleryApp">Mở lại hình ảnh trong ứng dụng thư viện</string>
+    <string name="openBackImageInGalleryApp">Mở hình ảnh mặt sau trong ứng dụng thư viện ảnh</string>
    <string name="failedToRetrieveImageFile">Không thể truy xuất tệp hình ảnh</string>
    <string name="app_contributors">Được thực hiện bởi: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="app_license">Phần mềm miễn phí có bản quyền theo giấy phép GPLv3+</string>
@@ -254,12 +250,12 @@
    <string name="spend">Tiêu</string>
    <string name="receive">Nhận được</string>
    <string name="amountParsingFailed">Số tiền không hợp lệ</string>
-    <string name="add_manually_warning_message">Đối với một số cửa hàng, giá trị mã vạch khác với số ghi trên thẻ. Vì lý do này, việc nhập mã vạch theo cách thủ công không phải lúc nào cũng hiệu quả. Thay vào đó, bạn nên quét mã vạch bằng máy ảnh của mình. Bạn vẫn muốn tiếp tục chứ?</string>
+    <string name="add_manually_warning_message">Đối với một số thẻ, giá trị mã vạch khác với số ghi trên thẻ. Vì lý do này, việc nhập mã vạch theo cách thủ công không phải lúc nào cũng hiệu quả. Thay vào đó, bạn nên quét mã vạch bằng máy ảnh của mình. Bạn vẫn muốn tiếp tục chứ?</string>
    <string name="addFromPdfFile">Chọn tệp PDF</string>
-    <string name="errorReadingFile">Không thể đọc tệp</string>
+    <string name="errorReadingFile">Không thể đọc tập tin</string>
    <string name="pageWithNumber">Page <xliff:g>%d</xliff:g></string>
    <string name="multipleBarcodesFoundPleaseChooseOne">Bạn muốn sử dụng mã vạch nào được tìm thấy?</string>
-    <string name="failedLaunchingFileManager">Không thể tìm thấy trình quản lý tệp được hỗ trợ</string>
+    <string name="failedLaunchingFileManager">Không thể tìm thấy trình quản lý tập tin được hỗ trợ</string>
    <string name="noCameraFoundGuideText">Có vẻ như thiết bị của bạn không có camera. Nếu có, hãy thử khởi động lại thiết bị. Nếu không, hãy sử dụng nút Tùy chọn khác bên dưới để thêm mã vạch theo cách khác.</string>
    <string name="useFrontImage">Sử dụng hình ảnh phía trước</string>
    <string name="useBackImage">Sử dụng hình ảnh phía sau</string>
@@ -279,10 +275,28 @@
    <string name="settings_column_count_6">6</string>
    <string name="settings_column_count_7">7</string>
    <string name="sort_by_valid_from">Có hiệu lực từ</string>
-    <string name="addFromPkpass">Chọn tệp Passbook (.pkpass)</string>
+    <string name="addFromPkpass">Chọn tập tin Passbook (.pkpass / .pkpasses)</string>
    <string name="unsupportedFile">Tập tin này không được hỗ trợ</string>
-    <string name="generic_error_please_retry">Xin lỗi, có gì đó không ổn, vui lòng thử lại...</string>
+    <string name="generic_error_please_retry">Có lỗi xảy ra</string>
    <string name="width">Chiều rộng</string>
    <string name="setBarcodeWidth">Đặt chiều rộng mã vạch</string>
    <string name="card_list_widget_name">Danh sách thẻ</string>
+    <string name="card_list_widget_empty">Sau khi được nhập vào Catima, thẻ hội viên của bạn sẽ xuất hiện ở đây. Hãy đảm bảo tất cả các thẻ không ở trạng thái đã lưu trữ.</string>
+    <string name="cardWithNumber">Thẻ <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Thẻ <xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>)</string>
+    <string name="pleaseDoNotRotateTheDevice">Vui lòng không quay thiết bị, thao tác này sẽ huỷ hành động</string>
+    <string name="acra_catima_has_crashed">Rất tiếc, <xliff:g id="app_name">%s</xliff:g> đã bị lỗi. Vui lòng giúp chúng tôi sửa vấn đề này bằng cách gửi báo cáo lỗi.</string>
+    <string name="acra_explain_crash">Nếu được, bạn vui lòng mô tả rõ hơn về thao tác đã thực hiện tại đây:</string>
+    <string name="acra_crash_email_subject">Báo cáo lỗi <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="pref_enable_acra">Yêu cầu gửi báo cáo lỗi</string>
+    <string name="pref_enable_acra_summary">Khi nhấn cho phép, bạn sẽ được yêu cầu gửi báo cáo khi lỗi xảy ra. Báo cáo lỗi sẽ không bao giờ được tự động gửi đi.</string>
+    <string name="copy_value">Sao chép giá trị</string>
+    <string name="copied_to_clipboard">Sao chép vào bộ nhớ tạm</string>
+    <string name="nothing_to_copy">Không tìm thấy giá trị</string>
+    <string name="barcodeEncoding">Mã hoá mã vạch</string>
+    <string name="back">Quay lại</string>
+    <string name="settings_disable_nfc_while_viewing_card">Tạm dừng NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Tạm dừng NFC để tránh tự động kích hoạt thanh toán NFC khi đang xem một thẻ</string>
+    <string name="nfc_blocked_while_viewing_card">Đã tạm dừng NFC</string>
+    <string name="change_settings">Thay đổi cài đặt</string>
 </resources>
@@ -282,7 +282,7 @@
    <string name="setBarcodeWidth">设置条码宽度</string>
    <string name="card_list_widget_name">卡片列表</string>
    <string name="card_list_widget_empty">在 Catima 中添加了一些会员卡后，它们会出现在这里。如果你有卡片，确保不是所有都已归档。</string>
-    <string name="cardWithNumber">卡<xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumber"><xliff:g>%d</xliff:g> 卡</string>
    <string name="cardWithNumberAndLocale">卡 <xliff:g>%d</xliff:g> （<xliff:g>%s</xliff:g>）</string>
    <string name="pleaseDoNotRotateTheDevice">请不要旋转设备，这样做会取消操作</string>
    <string name="acra_catima_has_crashed">抱歉，但 <xliff:g id="app_name">%s</xliff:g>崩溃了。请发送错误报告帮助修复这个问题。</string>
@@ -295,4 +295,8 @@
    <string name="nothing_to_copy">没找到值</string>
    <string name="barcodeEncoding">条形码编码</string>
    <string name="back">返回</string>
+    <string name="settings_disable_nfc_while_viewing_card">暂停 NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">暂停 NFC 防止在查看卡片时触发 NFC 支付</string>
+    <string name="nfc_blocked_while_viewing_card">NFC 已暂停</string>
+    <string name="change_settings">更改设置</string>
 </resources>
@@ -294,4 +294,8 @@
    <string name="nothing_to_copy">未找到值</string>
    <string name="barcodeEncoding">條碼編碼</string>
    <string name="back">返回</string>
+    <string name="settings_disable_nfc_while_viewing_card">暫停 NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">暫停 NFC，以防止在檢視卡片時觸發 NFC 付款</string>
+    <string name="nfc_blocked_while_viewing_card">NFC 已暫停</string>
+    <string name="change_settings">變更設定</string>
 </resources>
@@ -101,6 +101,9 @@
    <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_disable_nfc_while_viewing_card">Pause NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Pauses NFC to prevent NFC payments from triggering while viewing a card</string>
+    <string name="settings_key_disable_nfc_while_viewing_card" translatable="false">pref_disable_nfc_while_viewing_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>
@@ -345,4 +348,7 @@
    <string name="nothing_to_copy">No value found</string>
    <string name="barcodeEncoding">Barcode encoding</string>
    <string name="back">Back</string>
+    <string name="nfc_blocked_while_viewing_card">NFC is paused</string>
+    <string name="change_settings">Change settings</string>
+    <string name="nfc_block_system_error">Failed to pause NFC</string>
 </resources>
@@ -109,6 +109,15 @@
            android:title="@string/settings_disable_lockscreen_while_viewing_card"
            app:iconSpaceReserved="false"
            app:singleLineTitle="false" />
+
+        <SwitchPreferenceCompat
+            android:widgetLayout="@layout/preference_material_switch"
+            android:defaultValue="true"
+            android:key="@string/settings_key_disable_nfc_while_viewing_card"
+            android:summary="@string/settings_disable_nfc_while_viewing_card_summary"
+            android:title="@string/settings_disable_nfc_while_viewing_card"
+            app:iconSpaceReserved="false"
+            app:singleLineTitle="false" />
    </PreferenceCategory>

    <PreferenceCategory
@@ -7,6 +7,7 @@ import android.content.pm.ApplicationInfo
 import android.content.pm.ResolveInfo
 import android.view.View
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.Robolectric
@@ -61,6 +62,12 @@ class ImportExportActivityTest {
        assertEquals(state, buttonView.visibility)
    }

+    @Test
+    fun testExportFilenameHasTimestamp() {
+        val filename = ImportExportActivity.getExportFilename()
+        assertTrue(filename.matches(Regex("catima_\\d{8}\\.zip")))
+    }
+
    @Test
    fun testAllOptionsAvailable() {
        registerIntentHandler(Intent.ACTION_PICK)
@@ -51,6 +51,7 @@ import com.google.android.material.textfield.TextInputLayout;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.client.android.Intents;

+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -71,13 +72,19 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
 import java.util.Currency;
 import java.util.Date;
+import java.util.List;
+
+import protect.card_locker.cardview.LoyaltyCardViewActivity;

@RunWith(RobolectricTestRunner.class)
 public class LoyaltyCardViewActivityTest {
    private final String BARCODE_DATA = "428311627547";
    private final CatimaBarcode BARCODE_TYPE = CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A);
+    private final List<ActivityController<? extends Activity>> activityControllers = new ArrayList<>();
+    private final List<DBHelper> dbHelpers = new ArrayList<>();

    private final String EAN_BARCODE_DATA = "4763705295336";
    private final CatimaBarcode EAN_BARCODE_TYPE = CatimaBarcode.fromBarcode(BarcodeFormat.EAN_13);
@@ -101,6 +108,30 @@ public class LoyaltyCardViewActivityTest {
        ShadowLog.stream = System.out;
    }

+    @After
+    public void tearDown() {
+        for (int index = activityControllers.size() - 1; index >= 0; index--) {
+            ActivityController<? extends Activity> activityController = activityControllers.get(index);
+            try {
+                activityController.pause().stop().destroy();
+            } catch (RuntimeException ignored) {
+                try {
+                    activityController.destroy();
+                } catch (RuntimeException ignoredAgain) {
+                }
+            }
+        }
+        activityControllers.clear();
+
+        for (int index = dbHelpers.size() - 1; index >= 0; index--) {
+            try {
+                dbHelpers.get(index).close();
+            } catch (RuntimeException ignored) {
+            }
+        }
+        dbHelpers.clear();
+    }
+
    /**
     * Register a handler in the package manager for a image capture intent
     */
@@ -137,87 +168,110 @@ public class LoyaltyCardViewActivityTest {
                                              final String barcodeType,
                                              final String barcodeEncoding,
                                              boolean creatingNewCard) throws ParseException {
-        SQLiteDatabase database = new DBHelper(activity).getWritableDatabase();
-        if (creatingNewCard) {
-            assertEquals(0, DBHelper.getLoyaltyCardCount(database));
-        } else {
+        DBHelper dbHelper = new DBHelper(activity);
+        SQLiteDatabase database = dbHelper.getWritableDatabase();
+        try {
+            if (creatingNewCard) {
+                assertEquals(0, DBHelper.getLoyaltyCardCount(database));
+            } else {
+                assertEquals(1, DBHelper.getLoyaltyCardCount(database));
+            }
+
+            final EditText storeField = activity.findViewById(R.id.storeNameEdit);
+            final EditText noteField = activity.findViewById(R.id.noteEdit);
+            final TextInputLayout validFromView = activity.findViewById(R.id.validFromView);
+            final TextInputLayout expiryView = activity.findViewById(R.id.expiryView);
+            final EditText balanceView = activity.findViewById(R.id.balanceField);
+            final EditText balanceCurrencyField = activity.findViewById(R.id.balanceCurrencyField);
+            final TextView cardIdField = activity.findViewById(R.id.cardIdView);
+            final TextView barcodeIdField = activity.findViewById(R.id.barcodeIdField);
+            final TextView barcodeTypeField = activity.findViewById(R.id.barcodeTypeField);
+            final TextView barcodeEncodingField = activity.findViewById(R.id.barcodeEncodingField);
+
+            storeField.setText(store);
+            noteField.setText(note);
+            validFromView.setTag(validFrom);
+            expiryView.setTag(expiry);
+            balanceView.setText(balance.toPlainString());
+            balanceCurrencyField.setText(balanceType);
+            cardIdField.setText(cardId);
+            barcodeIdField.setText(barcodeId);
+            barcodeTypeField.setText(barcodeType);
+            barcodeEncodingField.setText(barcodeEncoding);
+
+            assertEquals(false, activity.isFinishing());
+            activity.findViewById(R.id.fabSave).performClick();
+            assertEquals(true, activity.isFinishing());
+
            assertEquals(1, DBHelper.getLoyaltyCardCount(database));
+
+            LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), database, 1);
+            assertEquals(store, card.store);
+            assertEquals(note, card.note);
+            assertEquals(balance, card.balance);
+
+            // The special "Any date" string shouldn't actually be written to the loyalty card
+            if (validFrom.equals(activity.getApplicationContext().getString(R.string.anyDate))) {
+                assertEquals(null, card.validFrom);
+            } else {
+                assertEquals(DateFormat.getDateInstance().parse(validFrom), card.validFrom);
+            }
+
+            // The special "Never" string shouldn't actually be written to the loyalty card
+            if (expiry.equals(activity.getApplicationContext().getString(R.string.never))) {
+                assertEquals(null, card.expiry);
+            } else {
+                assertEquals(DateFormat.getDateInstance().parse(expiry), card.expiry);
+            }
+
+            // The special "Points" string shouldn't actually be written to the loyalty card
+            if (balanceType.equals(activity.getApplicationContext().getString(R.string.points))) {
+                assertEquals(null, card.balanceType);
+            } else {
+                assertEquals(Currency.getInstance(balanceType), card.balanceType);
+            }
+            assertEquals(cardId, card.cardId);
+
+            // The special "Same as barcode ID" string shouldn't actually be written to the loyalty card
+            if (barcodeId.equals(activity.getApplicationContext().getString(R.string.sameAsCardId))) {
+                assertEquals(null, card.barcodeId);
+            } else {
+                assertEquals(barcodeId, card.barcodeId);
+            }
+
+            // The special "No barcode" string shouldn't actually be written to the loyalty card
+            if (barcodeType.equals(activity.getApplicationContext().getString(R.string.noBarcode))) {
+                assertEquals(null, card.barcodeType);
+            } else {
+                assertEquals(CatimaBarcode.fromName(barcodeType).format(), card.barcodeType.format());
+            }
+
+            assertEquals(Charset.forName(barcodeEncoding), card.barcodeEncoding);
+
+            assertNotNull(card.headerColor);
+        } finally {
+            dbHelper.close();
        }
+    }

-        final EditText storeField = activity.findViewById(R.id.storeNameEdit);
-        final EditText noteField = activity.findViewById(R.id.noteEdit);
-        final TextInputLayout validFromView = activity.findViewById(R.id.validFromView);
-        final TextInputLayout expiryView = activity.findViewById(R.id.expiryView);
-        final EditText balanceView = activity.findViewById(R.id.balanceField);
-        final EditText balanceCurrencyField = activity.findViewById(R.id.balanceCurrencyField);
-        final TextView cardIdField = activity.findViewById(R.id.cardIdView);
-        final TextView barcodeIdField = activity.findViewById(R.id.barcodeIdField);
-        final TextView barcodeTypeField = activity.findViewById(R.id.barcodeTypeField);
-        final TextView barcodeEncodingField = activity.findViewById(R.id.barcodeEncodingField);
+    private SQLiteDatabase getWritableEmptyDatabase(Context context) {
+        DBHelper dbHelper = TestHelpers.getEmptyDb(context);
+        dbHelpers.add(dbHelper);
+        return dbHelper.getWritableDatabase();
+    }

-        storeField.setText(store);
-        noteField.setText(note);
-        validFromView.setTag(validFrom);
-        expiryView.setTag(expiry);
-        balanceView.setText(balance.toPlainString());
-        balanceCurrencyField.setText(balanceType);
-        cardIdField.setText(cardId);
-        barcodeIdField.setText(barcodeId);
-        barcodeTypeField.setText(barcodeType);
-        barcodeEncodingField.setText(barcodeEncoding);
+    private <T extends Activity> ActivityController<T> trackActivityController(ActivityController<T> activityController) {
+        activityControllers.add(activityController);
+        return activityController;
+    }

-        assertEquals(false, activity.isFinishing());
-        activity.findViewById(R.id.fabSave).performClick();
-        assertEquals(true, activity.isFinishing());
-
-        assertEquals(1, DBHelper.getLoyaltyCardCount(database));
-
-        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), database, 1);
-        assertEquals(store, card.store);
-        assertEquals(note, card.note);
-        assertEquals(balance, card.balance);
-
-        // The special "Any date" string shouldn't actually be written to the loyalty card
-        if (validFrom.equals(activity.getApplicationContext().getString(R.string.anyDate))) {
-            assertEquals(null, card.validFrom);
+    private void checkFieldType(final Activity activity, final int id, FieldTypeView fieldTypeView) {
+        final View view = activity.findViewById(id);
+        if (fieldTypeView == FieldTypeView.TextView) {
+            assertTrue(view instanceof TextView);
        } else {
-            assertEquals(DateFormat.getDateInstance().parse(validFrom), card.validFrom);
+            assertTrue(view instanceof TextInputLayout || view instanceof ImageView);
        }
-
-        // The special "Never" string shouldn't actually be written to the loyalty card
-        if (expiry.equals(activity.getApplicationContext().getString(R.string.never))) {
-            assertEquals(null, card.expiry);
-        } else {
-            assertEquals(DateFormat.getDateInstance().parse(expiry), card.expiry);
-        }
-
-        // The special "Points" string shouldn't actually be written to the loyalty card
-        if (balanceType.equals(activity.getApplicationContext().getString(R.string.points))) {
-            assertEquals(null, card.balanceType);
-        } else {
-            assertEquals(Currency.getInstance(balanceType), card.balanceType);
-        }
-        assertEquals(cardId, card.cardId);
-
-        // The special "Same as barcode ID" string shouldn't actually be written to the loyalty card
-        if (barcodeId.equals(activity.getApplicationContext().getString(R.string.sameAsCardId))) {
-            assertEquals(null, card.barcodeId);
-        } else {
-            assertEquals(barcodeId, card.barcodeId);
-        }
-
-        // The special "No barcode" string shouldn't actually be written to the loyalty card
-        if (barcodeType.equals(activity.getApplicationContext().getString(R.string.noBarcode))) {
-            assertEquals(null, card.barcodeType);
-        } else {
-            assertEquals(CatimaBarcode.fromName(barcodeType).format(), card.barcodeType.format());
-        }
-
-        assertEquals(Charset.forName(barcodeEncoding), card.barcodeEncoding);
-
-        assertNotNull(card.headerColor);
-
-        database.close();
    }

    /**
@@ -357,7 +411,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    @Config(qualifiers="de")
    public void noCrashOnRegionlessLocale() {
-        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create();
+        ActivityController activityController = trackActivityController(Robolectric.buildActivity(LoyaltyCardEditActivity.class).create());

        LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get();
        final Context context = activity.getApplicationContext();
@@ -375,107 +429,110 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void noDataLossOnResumeOrRotate() {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);
+        try {
+            registerMediaStoreIntentHandler();

-        registerMediaStoreIntentHandler();
+            Integer cardId;

-        Integer cardId;
+            for (boolean newCard : new boolean[]{false, true}) {
+                System.out.println();
+                System.out.println("=====");
+                System.out.println("New card? " + newCard);
+                System.out.println("=====");
+                System.out.println();

-        for (boolean newCard : new boolean[]{false, true}) {
-            System.out.println();
-            System.out.println("=====");
-            System.out.println("New card? " + newCard);
-            System.out.println("=====");
-            System.out.println();
+                if (!newCard) {
+                    cardId = (int) DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.UTF_8, Color.BLACK, 0, null, 0);
+                } else {
+                    cardId = null;
+                }

-            if (!newCard) {
-                cardId = (int) DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.UTF_8, Color.BLACK, 0, null, 0);
-            } else {
-                cardId = null;
+                ActivityController activityController = createActivityWithLoyaltyCard(true, cardId);
+                LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get();
+
+                activityController.start();
+                activityController.visible();
+                activityController.resume();
+
+                shadowOf(getMainLooper()).idle();
+
+                // Check default settings
+                checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, newCard ? "" : "store", newCard ? "" : "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), newCard ? "" : EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), newCard ? context.getString(R.string.noBarcode) : EAN_BARCODE_TYPE.prettyName(), newCard ? "ISO-8859-1" : "UTF-8", null, null);
+
+                // Change everything
+                final EditText storeField = activity.findViewById(R.id.storeNameEdit);
+                final EditText noteField = activity.findViewById(R.id.noteEdit);
+                final EditText validFromField = activity.findViewById(R.id.validFromField);
+                final EditText expiryField = activity.findViewById(R.id.expiryField);
+                final EditText balanceField = activity.findViewById(R.id.balanceField);
+                final EditText balanceTypeField = activity.findViewById(R.id.balanceCurrencyField);
+                final EditText cardIdField = activity.findViewById(R.id.cardIdView);
+                final EditText barcodeField = activity.findViewById(R.id.barcodeIdField);
+                final EditText barcodeTypeField = activity.findViewById(R.id.barcodeTypeField);
+                final EditText barcodeEncodingField = activity.findViewById(R.id.barcodeEncodingField);
+                final ImageView frontImageView = activity.findViewById(R.id.frontImage);
+                final ImageView backImageView = activity.findViewById(R.id.backImage);
+
+                Currency currency = Currency.getInstance("EUR");
+                Date validFromDate = Date.from(Instant.now().minus(20, ChronoUnit.DAYS));
+                Date expiryDate = new Date();
+                Bitmap frontBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.circle);
+                Bitmap backBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_done);
+
+                storeField.setText("correct store");
+                noteField.setText("correct note");
+                LoyaltyCardEditActivity.formatDateField(context, validFromField, validFromDate);
+                activity.setLoyaltyCardValidFrom(validFromDate);
+                LoyaltyCardEditActivity.formatDateField(context, expiryField, expiryDate);
+                activity.setLoyaltyCardExpiry(expiryDate);
+                balanceField.setText("100");
+                balanceTypeField.setText(currency.getSymbol());
+                cardIdField.setText("12345678");
+                barcodeField.setText("87654321");
+                barcodeTypeField.setText(CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName());
+                barcodeEncodingField.setText(StandardCharsets.ISO_8859_1.name());
+                activity.setCardImage(ImageLocationType.front, frontImageView, frontBitmap, true);
+                activity.setCardImage(ImageLocationType.back, backImageView, backBitmap, true);
+
+                shadowOf(getMainLooper()).idle();
+
+                // Check if changed
+                checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, "correct store", "correct note", DateFormat.getDateInstance(DateFormat.LONG).format(validFromDate), DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate), "100.00", currency.getSymbol(), "12345678", "87654321", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName(), StandardCharsets.ISO_8859_1.name(), frontBitmap, backBitmap);
+
+                // Resume
+                activityController.pause();
+                activityController.resume();
+
+                shadowOf(getMainLooper()).idle();
+
+                // Check if no changes lost
+                checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, "correct store", "correct note", DateFormat.getDateInstance(DateFormat.LONG).format(validFromDate), DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate), "100.00", currency.getSymbol(), "12345678", "87654321", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName(), StandardCharsets.ISO_8859_1.name(), frontBitmap, backBitmap);
+
+                // Rotate to landscape
+                activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+                activity.recreate();
+                shadowOf(getMainLooper()).idle();
+
+                // Check if no changes lost
+                checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, "correct store", "correct note", DateFormat.getDateInstance(DateFormat.LONG).format(validFromDate), DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate), "100.00", currency.getSymbol(), "12345678", "87654321", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName(), StandardCharsets.ISO_8859_1.name(), frontBitmap, backBitmap);
+
+                // Rotate to portrait
+                shadowOf(getMainLooper()).idle();
+                activity.recreate();
+                activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+
+                // Check if no changes lost
+                checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, "correct store", "correct note", DateFormat.getDateInstance(DateFormat.LONG).format(validFromDate), DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate), "100.00", currency.getSymbol(), "12345678", "87654321", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName(), StandardCharsets.ISO_8859_1.name(), frontBitmap, backBitmap);
            }
-
-            ActivityController activityController = createActivityWithLoyaltyCard(true, cardId);
-            LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get();
-
-            activityController.start();
-            activityController.visible();
-            activityController.resume();
-
-            shadowOf(getMainLooper()).idle();
-
-            // Check default settings
-            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, newCard ? "" : "store", newCard ? "" : "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), newCard ? "" : EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), newCard ? context.getString(R.string.noBarcode) : EAN_BARCODE_TYPE.prettyName(), newCard ? "ISO-8859-1" : "UTF-8", null, null);
-
-            // Change everything
-            final EditText storeField = activity.findViewById(R.id.storeNameEdit);
-            final EditText noteField = activity.findViewById(R.id.noteEdit);
-            final EditText validFromField = activity.findViewById(R.id.validFromField);
-            final EditText expiryField = activity.findViewById(R.id.expiryField);
-            final EditText balanceField = activity.findViewById(R.id.balanceField);
-            final EditText balanceTypeField = activity.findViewById(R.id.balanceCurrencyField);
-            final EditText cardIdField = activity.findViewById(R.id.cardIdView);
-            final EditText barcodeField = activity.findViewById(R.id.barcodeIdField);
-            final EditText barcodeTypeField = activity.findViewById(R.id.barcodeTypeField);
-            final EditText barcodeEncodingField = activity.findViewById(R.id.barcodeEncodingField);
-            final ImageView frontImageView = activity.findViewById(R.id.frontImage);
-            final ImageView backImageView = activity.findViewById(R.id.backImage);
-
-            Currency currency = Currency.getInstance("EUR");
-            Date validFromDate = Date.from(Instant.now().minus(20, ChronoUnit.DAYS));
-            Date expiryDate = new Date();
-            Bitmap frontBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.circle);
-            Bitmap backBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_done);
-
-            storeField.setText("correct store");
-            noteField.setText("correct note");
-            LoyaltyCardEditActivity.formatDateField(context, validFromField, validFromDate);
-            activity.setLoyaltyCardValidFrom(validFromDate);
-            LoyaltyCardEditActivity.formatDateField(context, expiryField, expiryDate);
-            activity.setLoyaltyCardExpiry(expiryDate);
-            balanceField.setText("100");
-            balanceTypeField.setText(currency.getSymbol());
-            cardIdField.setText("12345678");
-            barcodeField.setText("87654321");
-            barcodeTypeField.setText(CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName());
-            barcodeEncodingField.setText(StandardCharsets.ISO_8859_1.name());
-            activity.setCardImage(ImageLocationType.front, frontImageView, frontBitmap, true);
-            activity.setCardImage(ImageLocationType.back, backImageView, backBitmap, true);
-
-            shadowOf(getMainLooper()).idle();
-
-            // Check if changed
-            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, "correct store", "correct note", DateFormat.getDateInstance(DateFormat.LONG).format(validFromDate), DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate), "100.00", currency.getSymbol(), "12345678", "87654321", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName(), StandardCharsets.ISO_8859_1.name(), frontBitmap, backBitmap);
-
-            // Resume
-            activityController.pause();
-            activityController.resume();
-
-            shadowOf(getMainLooper()).idle();
-
-            // Check if no changes lost
-            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, "correct store", "correct note", DateFormat.getDateInstance(DateFormat.LONG).format(validFromDate), DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate), "100.00", currency.getSymbol(), "12345678", "87654321", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName(), StandardCharsets.ISO_8859_1.name(), frontBitmap, backBitmap);
-
-            // Rotate to landscape
-            activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-            activity.recreate();
-            shadowOf(getMainLooper()).idle();
-
-            // Check if no changes lost
-            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, "correct store", "correct note", DateFormat.getDateInstance(DateFormat.LONG).format(validFromDate), DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate), "100.00", currency.getSymbol(), "12345678", "87654321", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName(), StandardCharsets.ISO_8859_1.name(), frontBitmap, backBitmap);
-
-            // Rotate to portrait
-            shadowOf(getMainLooper()).idle();
-            activity.recreate();
-            activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-
-            // Check if no changes lost
-            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, "correct store", "correct note", DateFormat.getDateInstance(DateFormat.LONG).format(validFromDate), DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate), "100.00", currency.getSymbol(), "12345678", "87654321", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName(), StandardCharsets.ISO_8859_1.name(), frontBitmap, backBitmap);
+        } finally {
+            database.close();
        }
    }

    @Test
    public void startWithoutParametersCheckFieldsAvailable() {
-        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create();
+        ActivityController activityController = trackActivityController(Robolectric.buildActivity(LoyaltyCardEditActivity.class).create());
        activityController.start();
        activityController.visible();
        activityController.resume();
@@ -489,9 +546,9 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void startWithoutParametersCannotCreateLoyaltyCard() {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

-        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create();
+        ActivityController activityController = trackActivityController(Robolectric.buildActivity(LoyaltyCardEditActivity.class).create());
        activityController.start();
        activityController.visible();
        activityController.resume();
@@ -519,7 +576,7 @@ public class LoyaltyCardViewActivityTest {

    @Test
    public void startWithoutParametersBack() {
-        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create();
+        ActivityController activityController = trackActivityController(Robolectric.buildActivity(LoyaltyCardEditActivity.class).create());
        activityController.start();
        activityController.visible();
        activityController.resume();
@@ -535,7 +592,7 @@ public class LoyaltyCardViewActivityTest {
    public void startWithoutParametersCaptureBarcodeCreateLoyaltyCard() throws IOException, ParseException {
        registerMediaStoreIntentHandler();

-        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create();
+        ActivityController activityController = trackActivityController(Robolectric.buildActivity(LoyaltyCardEditActivity.class).create());
        activityController.start();
        activityController.visible();
        activityController.resume();
@@ -559,7 +616,7 @@ public class LoyaltyCardViewActivityTest {

    @Test
    public void startWithoutParametersCaptureBarcodeFailure() throws IOException {
-        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create();
+        ActivityController activityController = trackActivityController(Robolectric.buildActivity(LoyaltyCardEditActivity.class).create());
        activityController.start();
        activityController.visible();
        activityController.resume();
@@ -580,7 +637,7 @@ public class LoyaltyCardViewActivityTest {

    @Test
    public void startWithoutParametersCaptureBarcodeCancel() throws IOException {
-        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create();
+        ActivityController activityController = trackActivityController(Robolectric.buildActivity(LoyaltyCardEditActivity.class).create());
        activityController.start();
        activityController.visible();
        activityController.resume();
@@ -631,13 +688,13 @@ public class LoyaltyCardViewActivityTest {

        intent.putExtras(bundle);

-        return Robolectric.buildActivity(clazz, intent).create();
+        return trackActivityController(Robolectric.buildActivity(clazz, intent).create());
    }

    @Test
    public void startWithLoyaltyCardEditModeCheckDisplay() throws IOException {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -656,7 +713,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void startWithLoyaltyCardViewModeCheckDisplay() {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.UTF_8, Color.BLACK, 0, null, 0);

@@ -675,7 +732,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void startWithLoyaltyCardWithBarcodeUpdateBarcode() throws IOException {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.UTF_8, Color.BLACK, 0, null, 0);

@@ -700,7 +757,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void startWithLoyaltyCardWithReceiptUpdateReceiptCancel() throws IOException {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -739,7 +796,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void startWithLoyaltyCardNoExpirySetExpiry() throws IOException {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -772,7 +829,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void startWithLoyaltyCardExpirySetNoExpiry() {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, new Date(), new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -797,7 +854,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void startWithLoyaltyCardNoBalanceSetBalance() throws IOException {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -848,7 +905,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void startWithLoyaltyCardBalanceSetNoBalance() throws IOException {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("USD"), EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -889,7 +946,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void startWithLoyaltyCardSameAsCardIDUpdateBarcodeID() {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -921,7 +978,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void startWithLoyaltyCardSameAsCardIDUpdateCardID() {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -955,7 +1012,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void startWithLoyaltyCardDifferentFromCardIDUpdateCardIDUpdate() {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -992,7 +1049,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void startWithLoyaltyCardDifferentFromCardIDUpdateCardIDDoNotUpdate() {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -1029,7 +1086,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void checkMenu() {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -1074,7 +1131,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void startWithoutParametersViewBack() {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -1095,7 +1152,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void startWithoutColors() {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, null, 0, null, 0);

@@ -1116,7 +1173,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void startLoyaltyCardWithoutColorsSave() throws IOException, ParseException {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, null, 0, null, 0);

@@ -1136,7 +1193,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void startLoyaltyCardWithExplicitNoBarcodeSave() throws IOException, ParseException {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, null, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -1156,7 +1213,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void removeBarcodeFromLoyaltyCard() throws IOException, ParseException {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -1187,7 +1244,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void checkPushStarIcon() {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -1224,7 +1281,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void checkBarcodeFullscreenWorkflow() {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -1320,7 +1377,7 @@ public class LoyaltyCardViewActivityTest {
    @Test
    public void checkNoBarcodeFullscreenWorkflow() {
        final Context context = ApplicationProvider.getApplicationContext();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
+        SQLiteDatabase database = getWritableEmptyDatabase(context);

        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, null, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);

@@ -1366,7 +1423,7 @@ public class LoyaltyCardViewActivityTest {
        Intent intent = new Intent();
        intent.setData(importUri);

-        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class, intent).create();
+        ActivityController activityController = trackActivityController(Robolectric.buildActivity(LoyaltyCardEditActivity.class, intent).create());

        activityController.start();
        activityController.visible();
@@ -1388,7 +1445,7 @@ public class LoyaltyCardViewActivityTest {
        Intent intent = new Intent();
        intent.setData(importUri);

-        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class, intent).create();
+        ActivityController activityController = trackActivityController(Robolectric.buildActivity(LoyaltyCardEditActivity.class, intent).create());

        activityController.start();
        activityController.visible();
@@ -22,19 +22,20 @@ public class TestHelpers {
        SQLiteDatabase database = db.getWritableDatabase();

        // Make sure no files remain
-        Cursor cursor = DBHelper.getLoyaltyCardCursor(database);
-        cursor.moveToFirst();
-        while (!cursor.isAfterLast()) {
-            int cardID = cursor.getColumnIndex(DBHelper.LoyaltyCardDbIds.ID);
+        try (Cursor cursor = DBHelper.getLoyaltyCardCursor(database)) {
+            cursor.moveToFirst();
+            while (!cursor.isAfterLast()) {
+                int cardID = cursor.getColumnIndex(DBHelper.LoyaltyCardDbIds.ID);

-            for (ImageLocationType imageLocationType : ImageLocationType.values()) {
-                try {
-                    Utils.saveCardImage(context.getApplicationContext(), null, cardID, imageLocationType);
-                } catch (FileNotFoundException ignored) {
+                for (ImageLocationType imageLocationType : ImageLocationType.values()) {
+                    try {
+                        Utils.saveCardImage(context.getApplicationContext(), null, cardID, imageLocationType);
+                    } catch (FileNotFoundException ignored) {
+                    }
                }
-            }

-            cursor.moveToNext();
+                cursor.moveToNext();
+            }
        }

        // Make sure DB is empty
@@ -11,13 +11,13 @@ if [ -z "${ANDROID_HOME:-}" ]; then
 fi

 if [ -z "${JAVA_HOME:-}" ]; then
-  echo "JAVA_HOME is not set, setting to Java 21"
+  echo "JAVA_HOME is not set, setting to Java 25"
  if [ -f "/etc/debian_version" ]; then
-    echo "Debian-based distro, Java 21 is /usr/lib/jvm/java-21-openjdk-amd64"
-    export JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
+    echo "Debian-based distro, Java 25 is /usr/lib/jvm/java-25-openjdk-amd64"
+    export JAVA_HOME=/usr/lib/jvm/java-25-openjdk-amd64
  else
-    echo "Not Debian-based, assuming Fedora and setting Java 21 as /usr/lib/jvm/java-21-openjdk"
-    export JAVA_HOME=/usr/lib/jvm/java-21-openjdk
+    echo "Not Debian-based, assuming Fedora and setting Java 25 as /usr/lib/jvm/java-25-openjdk"
+    export JAVA_HOME=/usr/lib/jvm/java-25-openjdk
  fi
 fi

@@ -1 +1 @@
-إصلاح التفاف النص في مربع حوار الإضافة
+- إصلاح ملف النص في حوار الإضافة
@@ -0,0 +1,3 @@
+- Промяна на импорт/експорт по подразбиране. (pull #84 (https://github.com/brarcher/loyalty-card-locker/pull/84))
+- Корекция на низ на страница импорт/експорт. (pull #87 (https://github.com/brarcher/loyalty-card-locker/pull/87))
+- Подобрение на оформлението на тип⁃карти. Текстът би следвало да е по-лесен за прочитане, и вече е избираем за прочит, и избираем с дълго кликване. (pull #91 (https://github.com/brarcher/loyalty-card-locker/pull/91))
@@ -0,0 +1,5 @@
+- Старт откъм настоящ ИД. (pull #94 (https://github.com/brarcher/loyalty-card-locker/pull/94))
+- Лимит за шир. на щрих кодове с умисъл‐RAM, +грешки. (pull #103 (https://github.com/brarcher/loyalty-card-locker/pull/103))
+- ± "Въведи"‑"Промени" за ИД-а. (pull #104 (https://github.com/brarcher/loyalty-card-locker/pull/104))
+- Цв.схема (pull #107 (https://github.com/brarcher/loyalty-card-locker/pull/107))
+- +увод‐гид(1-ви старт). (pull #108 (https://github.com/brarcher/loyalty-card-locker/pull/108))
@@ -0,0 +1 @@
+- Предотвратяване на срив при ротация на екрана при първоначална настройка.
@@ -0,0 +1,2 @@
+- Промяна във в.0.11 доведе до намаляване потреблението на паметта при чертане на баркод, но засегна размера на баркода. Сега това е коригирано за запазване на размерите му. (pull #126 (https://github.com/brarcher/loyalty-card-locker/pull/126))
+- Обновени немски и френски преводи. (pull #122 (https://github.com/brarcher/loyalty-card-locker/pull/122), pull #124 (https://github.com/brarcher/loyalty-card-locker/pull/124), pull #125 (https://github.com/brarcher/loyalty-card-locker/pull/125))
@@ -1,4 +1,6 @@
- Подобрен е процеса по добавяне на карта
- Подобрени проверки
+- Подобрен е процеса по "Добави карта"
+- Подобрени проверки на поток
 - Поправен е дефект в интерфейса при превключване на архиви
 - В панела за придвижване се използва цвета на темата или картата (Андроид 8.1+)
+
+- Актуализация на срок на валидност и селектор на датата за изтичане- Добавяне на „винаги завъртай“ (игнорирайки системните настройки)
@@ -0,0 +1,4 @@
+- Цел Андроид 14
+- Отвори иконка на карта в галерия при допир
+- Подобрен дизайн на раздел Снимки в режим редакция
+- Обновен екран за прекарано време за да подържа получаване
@@ -0,0 +1,3 @@
+- Поддръжка за сканиране на PDF файлове за наличие на баркодове
+- Поддръжка за файлове‑изображения със множество баркодове
+- Незначителни корекции по ПИ (UI)
@@ -0,0 +1 @@
+- Множество корекции и подобрения за балансирана обработка
@@ -0,0 +1,4 @@
+- Поддръжка за създаване на карта при споделяне на обикновен текст
+- Показване на типа на изображението вместо баркода под изображенията
+- Корекция на евентуален срив при писане за импорт от апликация Nextcloud
+- Подобрена поддръжка за устройства без камера
@@ -0,0 +1,4 @@
+- Позволи дълго‐съхранени имена в режим преглед за разделяне върху множество редове
+- Опция за използване на лицето на картина на заден план за меню-миниатура
+- Незначителни импорт/експорт корекции
+- Незначителни корекции по ПИ (UI)
@@ -0,0 +1 @@
+- Корекция по жест на основния екран отхвърлящ клавиатурата и търсенето при Андроид 13+
@@ -0,0 +1,3 @@
+- Опция за навигиране на карти използвайки бутоните за сила на звука
+- Корекция Stocard импорт
+- Поправка на съобщение "Импортиране отменено" появяващо се след успешно импортиране
@@ -0,0 +1,3 @@
+- Добави запор за екран‐ротация при показ на карта. Ако е заключен, екрана ще премине към "вродената" си ориентация и последваща ротация ще бъде заключена. (pull #128 (https://github.com/brarcher/loyalty-card-locker/pull/128))
+- Ако карта бъде избрана от главен екран неуспешно, следва » послание. (pull #132 (https://github.com/brarcher/loyalty-card-locker/pull/132))
+- Корекция‐случай…оформлението на ИД-та не бяха откривани. (pull #128 (https://github.com/brarcher/loyalty-card-locker/pull/128))
@@ -0,0 +1 @@
+- Корекция на текстова обвивка при диалогов прозорец "Добави"
@@ -0,0 +1,4 @@
+- Промяна на колона по‐подразбиране за широки екрани до 4
+- Позволи заместване на бр. колони за портретна и пейзажна ориентация в настройките
+- Запази филтър‐търсене на главния екран при ротация или отваряне на карта
+- Максимален лимит за дължина на бележка на главния екран
@@ -0,0 +1,3 @@
+- Добавена Passbook (.pkpass) поддръжка
+- Корекция на внасяне на PDF файлове с прозрачност
+- Подобрен изглед за миниатюри с прозрачност
@@ -0,0 +1 @@
+- Поправка на срив при отваряне на невалидни pkpass файлове
@@ -0,0 +1 @@
+- Подобрение на икона за показ на архиви/със звезда
@@ -0,0 +1,3 @@
+- Цел Android 15
+- Корекция при случаите при които бутон запис покрива екран-редакция
+- Корекция на pkpass файлове които не бяха засичани като pkpass (application/vnd-com.apple.pkpass mime type support)
@@ -0,0 +1,2 @@
+- Възможност за сортиране на карти по начална валидност
+- Временно връщане към цел: Андроид 14 за корекция на някои проблеми са ПИ
				`@@ -0,0 +1 @@`
				`- Предотвратяване на срив при ротация на екрана при първоначална настройка.`
				`@@ -0,0 +1 @@`
				`- Множество корекции и подобрения за балансирана обработка`
				`@@ -0,0 +1 @@`
				`- Корекция по жест на основния екран отхвърлящ клавиатурата и търсенето при Андроид 13+`
				`@@ -0,0 +1 @@`
				`- Корекция на текстова обвивка при диалогов прозорец "Добави"`
				`@@ -0,0 +1 @@`
				`- Поправка на срив при отваряне на невалидни pkpass файлове`
				`@@ -0,0 +1 @@`
				`- Подобрение на икона за показ на архиви/със звезда`