Release Catima 2.43.0

Merge pull request #3203 from CatimaLoyalty/create-pull-request/patch-1783871664
Update Fastlane changelogs
2026-09-08 12:21:49 -04:00 · 2026-07-12 18:55:29 +02:00 · 2026-07-12 17:55:35 +02:00 · 2026-07-12 15:54:23 +00:00 · 2026-07-12 17:54:11 +02:00 · 2026-07-12 17:52:24 +02:00
1030 changed files with 8457 additions and 5010 deletions
@@ -9,10 +9,15 @@ updates:
      - mavenCentral
    schedule:
      interval: "daily"
+    cooldown:
+      default-days: 7
+  
  - package-ecosystem: "github-actions"
    directory: "/"
    schedule:
      interval: "weekly"
+    cooldown:
+      default-days: 7

 # Workaround for https://github.com/dependabot/dependabot-core/issues/6888
 registries:
@@ -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
@@ -32,41 +32,43 @@ jobs:
      matrix:
        flavor: [Foss, Gplay]
    steps:
-      - uses: actions/checkout@v5
-      - name: Fail on bad translations
-        run: if grep -ri "&lt;xliff" app/src/main/res/values*/strings.xml; then echo "Invalidly escaped translations found"; exit 1; fi
-      - uses: gradle/actions/wrapper-validation@v5
-      - name: set up OpenJDK 21
+      - uses: actions/checkout@v7.0.0
+      - uses: gradle/actions/wrapper-validation@v6.2.0
+      - 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 for non-free libraries
+        run: |
+          wget -q https://codeberg.org/Katastima/apkscanner/releases/download/v0.0.7/apk-scanner_v0.0.7.jar
+          java -jar apk-scanner_v0.0.7.jar scan-apk "$(echo 'app/build/outputs/apk/${{ matrix.flavor }}/release/app-${{ matrix.flavor }}-release-unsigned.apk' | tr '[:upper:]' '[:lower:]')"
      - 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)
-        uses: ReactiveCircus/android-emulator-runner@v2
+      - name: Run instrumented tests (API 23)
+        uses: ReactiveCircus/android-emulator-runner@v2.37.0
        with:
-          api-level: 21
+          api-level: 23
          arch: x86_64
          script: ./gradlew connected${{ matrix.flavor }}DebugAndroidTest
      - name: Run instrumented tests (API 35)
-        uses: ReactiveCircus/android-emulator-runner@v2
+        uses: ReactiveCircus/android-emulator-runner@v2.37.0
        with:
          api-level: 35
          arch: x86_64
          script: ./gradlew connected${{ matrix.flavor }}DebugAndroidTest
      - name: Archive test results
        if: always()
-        uses: actions/upload-artifact@v5.0.0
+        uses: actions/upload-artifact@v7.0.1
        with:
          name: test-results-flavor${{ matrix.flavor }}
          path: app/build/reports
@@ -19,15 +19,15 @@ jobs:
    steps:
    - name: Checkout repo
      id: checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v7.0.0
    - name: Setup Python
-      uses: actions/setup-python@v6.0.0
+      uses: actions/setup-python@v6.3.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@v7.0.8
+      uses: peter-evans/create-pull-request@v8.1.1
      with:
        title: "Update Fastlane changelogs"
        commit-message: "Update Fastlane changelogs"
@@ -17,15 +17,17 @@ jobs:
    steps:
    - name: Checkout repo
      id: checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v7.0.0
    - name: Update contributors
      id: update_contributors
      uses: TheLastProject/contributors-to-file-action@v3.2.0
      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@v7.0.8
+      uses: peter-evans/create-pull-request@v8.1.1
      with:
        title: "Update contributors"
        commit-message: "Update contributors"
@@ -17,7 +17,7 @@ jobs:
  generate-feature-graphic:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v7.0.0
    - name: Install requirements
      run: |
        sudo apt-get update
@@ -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@v7.0.8
+      uses: peter-evans/create-pull-request@v8.1.1
      with:
        title: "Update feature graphic"
        commit-message: "Update feature graphic"
@@ -0,0 +1,34 @@
+name: i18n check
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - staging
+      - trying
+  pull_request:
+    branches:
+      - main
+permissions:
+  actions: none
+  checks: none
+  contents: read
+  deployments: none
+  discussions: none
+  id-token: none
+  issues: none
+  packages: none
+  pages: none
+  pull-requests: none
+  repository-projects: none
+  security-events: none
+  statuses: none
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7.0.0
+      - name: Fail on bad translations
+        run: if grep -ri "&lt;xliff" app/src/main/res/values*/strings.xml; then echo "Invalidly escaped translations found"; exit 1; fi
+      - name: Check app_name consistency
+        run: bash .scripts/check_app_name.sh
@@ -1,19 +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@v5
-
-      - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@v2
@@ -17,13 +17,13 @@ jobs:
  update-locales:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v7.0.0
    - name: Add new locales
      run: .scripts/new-locales.py
    - name: Update locales
      run: .scripts/locales.py
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7.0.8
+      uses: peter-evans/create-pull-request@v8.1.1
      with:
        title: "Update locales"
        commit-message: "Update locales"
@@ -19,8 +19,8 @@
 /app/*.log
 /app/build
 /app/release
-/.idea
-
+/.idea/*
+!/.idea/icon.svg
 # Bundle
 /.bundle/
 /vendor/bundle
@@ -0,0 +1 @@
+../.design/ic_launcher_foreground.svg
@@ -0,0 +1 @@
+3.3.11
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+set -e
+shopt -s lastpipe   # Run last command in a pipeline in the current shell.
+
+# Colors
+LIGHTCYAN='\033[1;36m'
+GREEN='\033[0;32m'
+RED='\033[0;31m'
+NC='\033[0m'    # No Color
+
+# Vars
+SUCCESS=1
+CANONICAL_TITLE="Catima"
+# peo is only temporarily allowed due to https://github.com/WeblateOrg/weblate/issues/17455
+ALLOWLIST=("ar" "bn" "fa" "fa-IR" "he-IL" "hi" "hi-IN" "kn" "kn-IN" "ml" "mr" "peo", "ta" "ta-IN" "zh-rTW" "zh-TW")  # TODO: Link values and fastlane with different codes together
+
+function get_lang() {
+    LANG_DIRNAME=$(dirname "$FILE" | xargs basename)
+    LANG=${LANG_DIRNAME#values-}    # Fetch lang name
+    LANG=${LANG#values}             # Handle "app/src/main/res/values"
+    LANG=${LANG:-en}                # Default to en
+}
+
+# FIXME: This function should use its own variables and return a success/fail status, instead of working on global variables
+function check() {
+    # FIXME: This allows inconsistency between values and fastlane if the app name is not Catima
+    # When the app name is not Catima, it should still check if title.txt and strings.xml use the same app name (or start)
+    if echo "${ALLOWLIST[*]}" | grep -w -q "${LANG}" || [[ -z ${APP_NAME} ]]; then
+        return 0
+    fi
+
+    if [[ ${FILE} == *"title.txt" ]]; then
+        if [[ ! ${APP_NAME} =~ ^${CANONICAL_TITLE} ]]; then
+            echo -e "${RED}Error: ${LIGHTCYAN}title in $FILE ($LANG) is ${RED}'$APP_NAME'${LIGHTCYAN}, expected to start with ${GREEN}'$CANONICAL_TITLE'. ${NC}"
+            SUCCESS=0
+        fi
+    else
+        if [[ ${APP_NAME} != "${CANONICAL_TITLE}" ]]; then
+            echo -e "${RED}Error: ${LIGHTCYAN}app_name in $FILE ($LANG) is ${RED}'$APP_NAME'${LIGHTCYAN}, expected ${GREEN}'$CANONICAL_TITLE'. ${NC}"
+            SUCCESS=0
+        fi
+    fi
+}
+
+# FIXME: This checks all title.txt and strings.xml files separately, but it needs to check if the title.txt and strings.xml match for a language as well
+echo -e "${LIGHTCYAN}Checking title.txt's. ${NC}"
+
+find fastlane/metadata/android/* -maxdepth 1 -type f -name "title.txt" | while read -r FILE; do
+    APP_NAME=$(head -n 1 "$FILE")
+
+    get_lang
+    check
+done
+
+echo -e "${LIGHTCYAN}Checking string.xml's. ${NC}"
+
+find app/src/main/res/values* -maxdepth 1 -type f -name "strings.xml" | while read -r FILE; do
+    # FIXME: This only checks app_name, but there are more strings with Catima inside it
+    # It should check the original English text for all strings that contain Catima and ensure they use the correct app_name for consistency
+    APP_NAME=$(grep -oP '<string name="app_name">\K[^<]+' "$FILE" | head -n1)
+
+    get_lang
+    check
+done
+
+if [[ $SUCCESS -eq 1 ]]; then
+    echo -e "\n${GREEN}Success!! All app_name values match the canonical title. ${NC}"
+else
+    echo -e "\n${RED}Unsuccessful!! Some app_name values did not match the canonical titles. ${NC}"
+    exit 1
+fi
@@ -42,7 +42,7 @@ for lang in "$script_location/../../fastlane/metadata/android/"*; do
      ja-JP) sed -i "s/Lexend/Noto Sans CJK JP/" featureGraphic.svg ;;
      kn-IN) sed -i -e 's/font-size="150"/font-size="125"/' -e 's/\(<tspan x="469" \)y="270"/\1y="240"/' -e "s/Lobster/Noto Sans Kannada/" -e "s/Lexend/Noto Sans Kannada/" featureGraphic.svg ;;
      ko) sed -i "s/Lexend/Noto Sans CJK KR/" featureGraphic.svg ;;
-      ta-IN) sed -i -e 's/font-size="150"/font-size="115"/' featureGraphic.svg ;;
+      ta-IN) sed -i -e 's/font-size="150"/font-size="125"/' -e 's/\(<tspan x="469" \)y="270"/\1y="240"/' featureGraphic.svg ;;
      zh-CN) sed -i "s/Lexend/Noto Sans CJK SC/" featureGraphic.svg ;;
      zh-TW) sed -i -e "s/Lobster/Noto Sans CJK TC/" -e "s/Lexend/Noto Sans CJK TC/" featureGraphic.svg ;;
      *) ;;
@@ -1,5 +1,76 @@
 # Changelog

+## v2.43.0 - 167 (2026-07-12)
+
+- Add support for showing the card ID in the card list
+- Add support to sort by most recently added
+- Add internal image viewer for zooming card front/back/icon images
+
+## 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
+- Fix barcode selector activity showing white squares instead of barcodes
+
+## v2.41.5 - 162 (2026-01-15)
+
+- Fix list widget sometimes opening wrong card
+- Fix several bugs with shortcut handling
+- Fix About activity not using pure black title bar in OLED mode
+- Fully remove automatic barcode encoding detection
+- Expose barcode encoding through ContentProvider (used by Gadgetbridge)
+
+## v2.41.4 - 161 (2026-01-04)
+
+- Disable automatic barcode encoding detection for now (breaks too many cards)
+
+## v2.41.3 - 160 (2026-01-04)
+
+- Follow-up for fix in 2.41.2 for cards explicitly set to ISO-8859-1
+- Migrate old cards to ISO-8859-1 to fix sudden behaviour differences for existing cards
+
+## v2.41.2 - 159 (2026-01-03)
+
+- Fix change introduced in 2.41.0 that broke support for some scanners for non-UTF-8 barcodes
+
+## v2.41.1 - 158 (2025-12-31)
+
+- Fix status and navigation bar colour in new About activity
+
+## v2.41.0 - 157 (2025-12-30)
+
+- Add support for UTF-8 barcodes
+- Add duplicate option to main screen and reorder options slightly
+- Fix column count setting not being applied to group card list
+- Remove theme colour support
+- Reduce max photo size to reduce storage use (only for newly added photos)
+- Migrate About activity from Android XML to Jetpack Compose
+
+## v2.40.0 - 156 (2025-12-08)
+
+- Copy card ID to clipboard from view dialog or long press
+- Swap balance and currency fields to hopefully reduce unintended rounding
+
+## v2.39.2 - 155 (2025-11-04)
+
+- Preparations for future improvements (rewrote many classes to Kotlin)
+
 ## v2.39.1 - 154 (2025-10-01)

 - Fix possible crash that could occur for cards missing colour information in the database
@@ -23,7 +23,9 @@ for good reason.

 ## Code Changes

-Note: submitting LLM ("AI") generated code is strongly discouraged, as such
+### LLM ("AI") and coding agents
+
+**Note:** submitting LLM ("AI") generated code is strongly discouraged, as such
 code is often (subtly) incorrect or overcomplicated (for example: unnecessarily
 pulling in extra libraries for functionality already covered by existing
 libraries). It also often makes unrelated changes that increase the risk of
@@ -47,6 +49,14 @@ risk.

 Please never submit LLM-generated code as-is.

+### Kotlin and Compose migration
+
+Catima uses a lot of "legacy" tech, Java, Android XML. This will be ported to Kotlin,
+then Jetpack Compose; for further details, see
+<https://github.com/CatimaLoyalty/Android/issues/2483>.
+
+Thus, prefer Kotlin and Jetpack Compose for new code/UI where practical, especially new files/features.
+
 ### Test Your Code

 There are four possible tests you can run to verify your code.  The first
@@ -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,41 @@
 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.1249.0)
+    aws-sdk-core (3.247.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.125.0)
+      aws-sdk-core (~> 3, >= 3.247.0)
      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.189.1)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-s3 (1.222.0)
+      aws-sdk-core (~> 3, >= 3.247.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)
+    benchmark (0.5.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 +43,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,32 +55,36 @@ 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)
-      CFPropertyList (>= 2.3, < 4.0.0)
+    fastimage (2.4.1)
+    fastlane (2.234.0)
+      CFPropertyList (>= 2.3, < 5.0.0)
+      abbrev (~> 0.1)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
-      aws-sdk-s3 (~> 1.0)
+      aws-sdk-s3 (~> 1.197)
      babosa (>= 1.0.3, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
+      base64 (~> 0.2)
+      benchmark (>= 0.1.0)
+      bundler (>= 1.17.3, < 5.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)
@@ -87,20 +92,24 @@ GEM
      faraday-cookie_jar (~> 0.0.6)
      faraday_middleware (~> 1.0)
      fastimage (>= 2.1.0, < 3.0.0)
-      fastlane-sirp (>= 1.0.0)
+      fastlane-sirp (>= 1.1.0)
      gh_inspector (>= 1.1.2, < 2.0.0)
      google-apis-androidpublisher_v3 (~> 0.3)
      google-apis-playcustomapp_v1 (~> 0.1)
-      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-env (>= 1.6.0, <= 2.1.1)
      google-cloud-storage (~> 1.31)
      highline (~> 2.0)
      http-cookie (~> 1.0.5)
      json (< 3.0.0)
      jwt (>= 2.1.0, < 3)
+      logger (>= 1.6, < 2.0)
      mini_magick (>= 4.9.4, < 5.0.0)
      multipart-post (>= 2.0.0, < 3.0.0)
+      mutex_m (~> 0.3)
      naturally (~> 2.2)
+      nkf (~> 0.2)
      optparse (>= 0.1.1, < 1.0.0)
+      ostruct (>= 0.1.0)
      plist (>= 3.1.0, < 4.0.0)
      rubyzip (>= 2.0.0, < 3.0.0)
      security (= 0.1.5)
@@ -113,41 +122,42 @@ 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)
-    google-apis-core (0.11.3)
+    google-apis-androidpublisher_v3 (0.100.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-core (0.18.0)
      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
+      googleauth (~> 1.9)
+      httpclient (>= 2.8.3, < 3.a)
      mini_mime (~> 1.0)
+      mutex_m
      representable (~> 3.0)
      retriable (>= 2.0, < 4.a)
-      rexml
-    google-apis-iamcredentials_v1 (0.17.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.13.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.31.0)
-      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-iamcredentials_v1 (0.27.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.17.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-storage_v1 (0.62.0)
+      google-apis-core (>= 0.15.0, < 2.a)
    google-cloud-core (1.8.0)
      google-cloud-env (>= 1.0, < 3.a)
      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-storage (1.47.0)
+    google-cloud-env (2.1.1)
+      faraday (>= 1.0, < 3.a)
+    google-cloud-errors (1.6.0)
+    google-cloud-storage (1.60.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.31.0)
+      google-apis-core (>= 0.18, < 2)
+      google-apis-iamcredentials_v1 (~> 0.18)
+      google-apis-storage_v1 (>= 0.42)
      google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
+      googleauth (~> 1.9)
      mini_mime (~> 1.0)
-    googleauth (1.8.1)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (1.11.2)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
      jwt (>= 1.4, < 3.0)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
@@ -158,43 +168,42 @@ 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)
+    ostruct (0.6.3)
    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 +231,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.
@@ -1,8 +1,10 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.com.android.application)
    alias(libs.plugins.org.jetbrains.kotlin.android)
+    alias(libs.plugins.org.jetbrains.kotlin.plugin.compose)
 }

 kotlin {
@@ -15,15 +17,15 @@ android {

    defaultConfig {
        applicationId = "me.hackerchick.catima"
-        minSdk = 21
+        minSdk = 23
        targetSdk = 36
-        versionCode = 154
-        versionName = "2.39.1"
+        versionCode = 167
+        versionName = "2.43.0"

        vectorDrawables.useSupportLibrary = true
        multiDexEnabled = true

-        resourceConfigurations += listOf("ar", "be", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "et", "fa", "fi", "fr", "gl", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "ta", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
+        resourceConfigurations += listOf("ar", "be", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "et", "fa", "fi", "fr", "gl", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "peo", "pl", "pt", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "ta", "tr", "uk", "vi", "zh-rCN", "zh-rTW")

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

@@ -36,7 +38,7 @@ android {
        release {
            isMinifyEnabled = true
            proguardFiles(
-                getDefaultProguardFile("proguard-android.txt"),
+                getDefaultProguardFile("proguard-android-optimize.txt"),
                "proguard-rules.pro"
            )
        }
@@ -47,6 +49,7 @@ android {

    buildFeatures {
        buildConfig = true
+        compose = true
        viewBinding = true
    }

@@ -74,16 +77,6 @@ android {
        }
    }

-    compileOptions {
-        encoding = "UTF-8"
-
-        // Flag to enable support for the new language APIs
-        isCoreLibraryDesugaringEnabled = true
-
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
    sourceSets {
        getByName("test") {
            resources.srcDirs("src/test/res")
@@ -102,10 +95,18 @@ android {
    lint {
        lintConfig = file("lint.xml")
    }
-    kotlinOptions {
-        jvmTarget = "21"
+
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_21
+        }
    }
    compileOptions {
+        encoding = "UTF-8"
+
+        // Flag to enable support for the new language APIs
+        isCoreLibraryDesugaringEnabled = true
+
        sourceCompatibility = JavaVersion.VERSION_21
        targetCompatibility = JavaVersion.VERSION_21
    }
@@ -124,6 +125,19 @@ dependencies {
    implementation(libs.com.google.android.material.material)
    coreLibraryDesugaring(libs.com.android.tools.desugar.jdk.libs)

+    // Compose
+    implementation(libs.androidx.activity.activity.compose)
+    val composeBom = platform(libs.androidx.compose.compose.bom)
+    implementation(composeBom)
+    implementation(libs.androidx.compose.foundation.foundation)
+    implementation(libs.androidx.compose.material3.material3)
+    implementation(libs.androidx.compose.material.material.icons.extended)
+    implementation(libs.androidx.compose.ui.ui.tooling.preview.android)
+    debugImplementation(libs.androidx.compose.ui.ui.test.manifest)
+
+    androidTestImplementation(composeBom)
+    androidTestImplementation(libs.androidx.compose.ui.ui.test.junit4)
+
    // Third-party
    implementation(libs.com.journeyapps.zxing.android.embedded)
    implementation(libs.com.github.yalantis.ucrop)
@@ -143,6 +157,8 @@ dependencies {
    androidTestImplementation(libs.bundles.androidx.test)
    androidTestImplementation(libs.junit.junit)
    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.rules)
+    androidTestImplementation(libs.androidx.test.runner)
    androidTestImplementation(libs.androidx.test.uiautomator.uiautomator)
    androidTestImplementation(libs.androidx.test.espresso.espresso.core)
 }
@@ -0,0 +1,89 @@
+package protect.card_locker
+
+import android.app.Instrumentation
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsNotDisplayed
+import androidx.compose.ui.test.junit4.ComposeContentTestRule
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performScrollTo
+import androidx.compose.ui.test.runComposeUiTest
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import protect.card_locker.compose.theme.CatimaTheme
+
+@OptIn(ExperimentalTestApi::class)
+@RunWith(AndroidJUnit4::class)
+class AboutActivityTest {
+    @get:Rule
+    private val rule: ComposeContentTestRule = createComposeRule()
+
+    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
+
+    private val content: AboutContent = AboutContent(instrumentation.targetContext)
+
+    @Test
+    fun testInitialState(): Unit = runComposeUiTest {
+        setContent {
+            AboutScreenContent(content = content)
+        }
+
+        onNodeWithTag("topbar_catima").assertIsDisplayed()
+
+        onNodeWithTag("card_version_history").assertIsDisplayed()
+        onNodeWithText(content.versionHistory).assertIsDisplayed()
+
+        onNodeWithTag("card_credits").assertIsDisplayed()
+        onNodeWithText(content.copyrightShort).assertIsDisplayed()
+
+        onNodeWithTag("card_translate").assertIsDisplayed()
+        onNodeWithTag("card_license").assertIsDisplayed()
+
+        // We might be off the screen so start scrolling
+        onNodeWithTag("card_source_github").performScrollTo().assertIsDisplayed()
+        onNodeWithTag("card_privacy_policy").performScrollTo().assertIsDisplayed()
+        onNodeWithTag("card_donate").performScrollTo().assertIsDisplayed()
+        // Dont scroll to this, since its not displayed
+        onNodeWithTag("card_rate_google").assertIsNotDisplayed()
+        onNodeWithTag("card_report_error").performScrollTo().assertIsDisplayed()
+    }
+
+    @Test
+    fun testDonateAndGoogleCardVisible(): Unit = runComposeUiTest {
+        setContent {
+            CatimaTheme {
+                AboutScreenContent(
+                    content = content,
+                    showDonate = true,
+                    showRateOnGooglePlay = true,
+                )
+            }
+        }
+
+        onNodeWithTag("card_donate").performScrollTo().assertIsDisplayed()
+        onNodeWithTag("card_rate_google").performScrollTo().assertIsDisplayed()
+    }
+
+    @Test
+    fun testDonateAndGoogleCardHidden(): Unit = runComposeUiTest {
+        setContent {
+            CatimaTheme {
+                AboutScreenContent(
+                    content = content,
+                    showDonate = false,
+                    showRateOnGooglePlay = false,
+                )
+            }
+        }
+
+        onNodeWithTag("card_privacy_policy").performScrollTo().assertIsDisplayed()
+        onNodeWithTag("card_donate").assertIsNotDisplayed()
+        onNodeWithTag("card_rate_google").assertIsNotDisplayed()
+        onNodeWithTag("card_report_error").performScrollTo().assertIsDisplayed()
+    }
+}
@@ -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,9 +98,12 @@
            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
+            android:name=".cardimageview.LoyaltyCardImageViewActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
        <activity
            android:name=".LoyaltyCardEditActivity"
            android:exported="true"
@@ -1,149 +1,169 @@
 package protect.card_locker

 import android.os.Bundle
-import android.text.Spanned
-import android.view.MenuItem
-import android.view.View
-import android.widget.ScrollView
-import android.widget.TextView
+import androidx.activity.OnBackPressedDispatcher
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextLinkStyles
+import androidx.compose.ui.text.fromHtml
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.tooling.preview.Preview
+import protect.card_locker.compose.CatimaAboutSection
+import protect.card_locker.compose.CatimaTopAppBar
+import protect.card_locker.compose.theme.CatimaTheme

-import androidx.annotation.StringRes
-import androidx.core.view.isVisible
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-
-import protect.card_locker.databinding.AboutActivityBinding
-
-class AboutActivity : CatimaAppCompatActivity() {
-    private companion object {
-        private const val TAG = "Catima"
-    }
-
-    private lateinit var binding: AboutActivityBinding
+class AboutActivity : CatimaComponentActivity() {
    private lateinit var content: AboutContent

+    @OptIn(ExperimentalMaterial3Api::class)
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        binding = AboutActivityBinding.inflate(layoutInflater)
+
+        fixedEdgeToEdge()
+
        content = AboutContent(this)
        title = content.pageTitle
-        setContentView(binding.root)
-        setSupportActionBar(binding.toolbar)
-        enableToolbarBackButton()

-        binding.apply {
-            creditsSub.text = content.copyrightShort
-            versionHistorySub.text = content.versionHistory
-
-            versionHistory.tag = "https://catima.app/changelog/"
-            translate.tag = "https://hosted.weblate.org/engage/catima/"
-            license.tag = "https://github.com/CatimaLoyalty/Android/blob/main/LICENSE"
-            repo.tag = "https://github.com/CatimaLoyalty/Android/"
-            privacy.tag = "https://catima.app/privacy-policy/"
-            reportError.tag = "https://github.com/CatimaLoyalty/Android/issues"
-            rate.tag = "https://play.google.com/store/apps/details?id=me.hackerchick.catima"
-            donate.tag = "https://catima.app/donate"
-
-            // Hide Google Play rate button if not on Google Play
-            rate.isVisible = BuildConfig.showRateOnGooglePlay
-            // Hide donate button on Google Play (Google Play doesn't allow donation links)
-            donate.isVisible = BuildConfig.showDonate
-        }
-
-        bindClickListeners()
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            android.R.id.home -> {
-                finish()
-                true
+        setContent {
+            CatimaTheme {
+                AboutScreenContent(
+                    content = content,
+                    showDonate = BuildConfig.showDonate,
+                    showRateOnGooglePlay = BuildConfig.showRateOnGooglePlay,
+                    onBackPressedDispatcher = onBackPressedDispatcher
+                )
            }
-
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        content.destroy()
-        clearClickListeners()
-    }
-
-    private fun bindClickListeners() {
-        binding.apply {
-            versionHistory.setOnClickListener { showHistory(it) }
-            translate.setOnClickListener { openExternalBrowser(it) }
-            license.setOnClickListener { showLicense(it) }
-            repo.setOnClickListener { openExternalBrowser(it) }
-            privacy.setOnClickListener { showPrivacy(it) }
-            reportError.setOnClickListener { openExternalBrowser(it) }
-            rate.setOnClickListener { openExternalBrowser(it) }
-            donate.setOnClickListener { openExternalBrowser(it) }
-            credits.setOnClickListener { showCredits() }
-        }
-    }
-
-    private fun clearClickListeners() {
-        binding.apply {
-            versionHistory.setOnClickListener(null)
-            translate.setOnClickListener(null)
-            license.setOnClickListener(null)
-            repo.setOnClickListener(null)
-            privacy.setOnClickListener(null)
-            reportError.setOnClickListener(null)
-            rate.setOnClickListener(null)
-            donate.setOnClickListener(null)
-            credits.setOnClickListener(null)
-        }
-    }
-
-    private fun showCredits() {
-        showHTML(R.string.credits, content.contributorInfo, null)
-    }
-
-    private fun showHistory(view: View) {
-        showHTML(R.string.version_history, content.historyInfo, view)
-    }
-
-    private fun showLicense(view: View) {
-        showHTML(R.string.license, content.licenseInfo, view)
-    }
-
-    private fun showPrivacy(view: View) {
-        showHTML(R.string.privacy_policy, content.privacyInfo, view)
-    }
-
-    private fun showHTML(@StringRes title: Int, text: Spanned, view: View?) {
-        val dialogContentPadding = resources.getDimensionPixelSize(R.dimen.alert_dialog_content_padding)
-        val textView = TextView(this).apply {
-            setText(text)
-            Utils.makeTextViewLinksClickable(this, text)
-        }
-
-        val scrollView = ScrollView(this).apply {
-            addView(textView)
-            setPadding(dialogContentPadding, dialogContentPadding / 2, dialogContentPadding, 0)
-        }
-
-        MaterialAlertDialogBuilder(this).apply {
-            setTitle(title)
-            setView(scrollView)
-            setPositiveButton(R.string.ok, null)
-
-            // Add View online button if an URL is linked to this view
-            view?.tag?.let {
-                setNeutralButton(R.string.view_online) { _, _ -> openExternalBrowser(view) }
-            }
-
-            show()
-        }
-    }
-
-    private fun openExternalBrowser(view: View) {
-        val tag = view.tag
-        if (tag is String && tag.startsWith("https://")) {
-            OpenWebLinkHandler().openBrowser(this, tag)
        }
    }
 }
+
+@Composable
+fun AboutScreenContent(
+    content: AboutContent,
+    showDonate: Boolean = true,
+    showRateOnGooglePlay: Boolean = false,
+    onBackPressedDispatcher: OnBackPressedDispatcher? = null,
+) {
+    Scaffold(
+        topBar = { CatimaTopAppBar(content.pageTitle.toString(), onBackPressedDispatcher) }
+    ) { innerPadding ->
+        Column(
+            modifier = Modifier
+                .padding(innerPadding)
+                .verticalScroll(rememberScrollState())
+        ) {
+            CatimaAboutSection(
+                stringResource(R.string.version_history),
+                content.versionHistory,
+                modifier = Modifier.testTag("card_version_history"),
+                onClickUrl = "https://catima.app/changelog/",
+                onClickDialogText = AnnotatedString.fromHtml(
+                    htmlString = content.historyHtml,
+                    linkStyles = TextLinkStyles(
+                        style = SpanStyle(
+                            textDecoration = TextDecoration.Underline,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                    )
+                )
+            )
+            CatimaAboutSection(
+                stringResource(R.string.credits),
+                content.copyrightShort,
+                modifier = Modifier.testTag("card_credits"),
+                onClickDialogText = AnnotatedString.fromHtml(
+                    htmlString = content.contributorInfoHtml,
+                    linkStyles = TextLinkStyles(
+                        style = SpanStyle(
+                            textDecoration = TextDecoration.Underline,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                    )
+                )
+            )
+            CatimaAboutSection(
+                stringResource(R.string.help_translate_this_app),
+                stringResource(R.string.translate_platform),
+                modifier = Modifier.testTag("card_translate"),
+                onClickUrl = "https://hosted.weblate.org/engage/catima/"
+            )
+            CatimaAboutSection(
+                stringResource(R.string.license),
+                stringResource(R.string.app_license),
+                modifier = Modifier.testTag("card_license"),
+                onClickUrl = "https://github.com/CatimaLoyalty/Android/blob/main/LICENSE",
+                onClickDialogText = AnnotatedString.fromHtml(
+                    htmlString = content.licenseHtml,
+                    linkStyles = TextLinkStyles(
+                        style = SpanStyle(
+                            textDecoration = TextDecoration.Underline,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                    )
+                )
+            )
+            CatimaAboutSection(
+                stringResource(R.string.source_repository),
+                stringResource(R.string.on_github),
+                modifier = Modifier.testTag("card_source_github"),
+                onClickUrl = "https://github.com/CatimaLoyalty/Android/"
+            )
+            CatimaAboutSection(
+                stringResource(R.string.privacy_policy),
+                stringResource(R.string.and_data_usage),
+                modifier = Modifier.testTag("card_privacy_policy"),
+                onClickUrl = "https://catima.app/privacy-policy/",
+                onClickDialogText = AnnotatedString.fromHtml(
+                    htmlString = content.privacyHtml,
+                    linkStyles = TextLinkStyles(
+                        style = SpanStyle(
+                            textDecoration = TextDecoration.Underline,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                    )
+                )
+            )
+            if (showDonate) {
+                CatimaAboutSection(
+                    stringResource(R.string.donate),
+                    "",
+                    modifier = Modifier.testTag("card_donate"),
+                    onClickUrl = "https://catima.app/donate"
+                )
+            }
+            if (showRateOnGooglePlay) {
+                CatimaAboutSection(
+                    stringResource(R.string.rate_this_app),
+                    stringResource(R.string.on_google_play),
+                    modifier = Modifier.testTag("card_rate_google"),
+                    onClickUrl = "https://play.google.com/store/apps/details?id=me.hackerchick.catima"
+                )
+            }
+            CatimaAboutSection(
+                stringResource(R.string.report_error),
+                stringResource(R.string.on_github),
+                modifier = Modifier.testTag("card_report_error"),
+                onClickUrl = "https://github.com/CatimaLoyalty/Android/issues"
+            )
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun AboutActivityPreview() {
+    AboutScreenContent(AboutContent(LocalContext.current))
+}
@@ -3,11 +3,8 @@ package protect.card_locker;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.text.Spanned;
 import android.util.Log;

-import androidx.core.text.HtmlCompat;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -55,7 +52,7 @@ public class AboutContent {
        return context.getString(R.string.app_copyright_short);
    }

-    public String getContributors() {
+    public String getContributorsHtml() {
        String contributors;
        try {
            contributors = "<br/>" + Utils.readTextFile(context, R.raw.contributors);
@@ -65,7 +62,7 @@ public class AboutContent {
        return contributors.replace("\n", "<br />");
    }

-    public String getHistory() {
+    public String getHistoryHtml() {
        String versionHistory;
        try {
            versionHistory = Utils.readTextFile(context, R.raw.changelog)
@@ -77,7 +74,7 @@ public class AboutContent {
                .replace("\n", "<br />");
    }

-    public String getLicense() {
+    public String getLicenseHtml() {
        try {
            return Utils.readTextFile(context, R.raw.license);
        }  catch (IOException ignored) {
@@ -85,7 +82,7 @@ public class AboutContent {
        }
    }

-    public String getPrivacy() {
+    public String getPrivacyHtml() {
        String privacyPolicy;
        try {
            privacyPolicy = Utils.readTextFile(context, R.raw.privacy)
@@ -97,7 +94,7 @@ public class AboutContent {
                .replace("\n", "<br />");
    }

-    public String getThirdPartyLibraries() {
+    public String getThirdPartyLibrariesHtml() {
        final List<ThirdPartyInfo> usedLibraries = new ArrayList<>();
        usedLibraries.add(new ThirdPartyInfo("ACRA", "https://github.com/ACRA/acra", "Apache 2.0"));
        usedLibraries.add(new ThirdPartyInfo("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
@@ -116,7 +113,7 @@ public class AboutContent {
        return result.toString();
    }

-    public String getUsedThirdPartyAssets() {
+    public String getUsedThirdPartyAssetsHtml() {
        final List<ThirdPartyInfo> usedAssets = new ArrayList<>();
        usedAssets.add(new ThirdPartyInfo("Android icons", "https://fonts.google.com/icons?selected=Material+Icons", "Apache 2.0"));

@@ -129,31 +126,19 @@ public class AboutContent {
        return result.toString();
    }

-    public Spanned getContributorInfo() {
+    public String getContributorInfoHtml() {
        StringBuilder contributorInfo = new StringBuilder();
        contributorInfo.append(getCopyright());
        contributorInfo.append("<br/><br/>");
        contributorInfo.append(context.getString(R.string.app_copyright_old));
        contributorInfo.append("<br/><br/>");
-        contributorInfo.append(String.format(context.getString(R.string.app_contributors), getContributors()));
+        contributorInfo.append(String.format(context.getString(R.string.app_contributors), getContributorsHtml()));
        contributorInfo.append("<br/><br/>");
-        contributorInfo.append(String.format(context.getString(R.string.app_libraries), getThirdPartyLibraries()));
+        contributorInfo.append(String.format(context.getString(R.string.app_libraries), getThirdPartyLibrariesHtml()));
        contributorInfo.append("<br/><br/>");
-        contributorInfo.append(String.format(context.getString(R.string.app_resources), getUsedThirdPartyAssets()));
+        contributorInfo.append(String.format(context.getString(R.string.app_resources), getUsedThirdPartyAssetsHtml()));

-        return HtmlCompat.fromHtml(contributorInfo.toString(), HtmlCompat.FROM_HTML_MODE_COMPACT);
-    }
-
-    public Spanned getHistoryInfo() {
-        return HtmlCompat.fromHtml(getHistory(), HtmlCompat.FROM_HTML_MODE_COMPACT);
-    }
-
-    public Spanned getLicenseInfo() {
-        return HtmlCompat.fromHtml(getLicense(), HtmlCompat.FROM_HTML_MODE_LEGACY);
-    }
-
-    public Spanned getPrivacyInfo() {
-        return HtmlCompat.fromHtml(getPrivacy(), HtmlCompat.FROM_HTML_MODE_COMPACT);
+        return contributorInfo.toString();
    }

    public String getVersionHistory() {
@@ -4,17 +4,27 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
+import android.util.ArrayMap;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.zxing.EncodeHintType;
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.StringUtils;

 import java.lang.ref.WeakReference;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Objects;

 import protect.card_locker.async.CompatCallable;

@@ -39,6 +49,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
    private final WeakReference<TextView> textViewReference;
    private String cardId;
    private final CatimaBarcode format;
+    private final Charset encoding;
    private final int imageHeight;
    private final int imageWidth;
    private final int imagePadding;
@@ -46,9 +57,9 @@ 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, TextView textView,
+            CatimaBarcode barcodeFormat, @NonNull Charset barcodeEncoding, TextView textView,
            boolean showFallback, BarcodeImageWriterResultCallback callback, boolean roundCornerPadding, boolean isFullscreen
    ) {
        mContext = context;
@@ -62,6 +73,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {

        cardId = cardIdString;
        format = barcodeFormat;
+        encoding = barcodeEncoding;

        int imageViewHeight = imageView.getHeight();
        int imageViewWidth = imageView.getWidth();
@@ -172,10 +184,32 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
        }

        MultiFormatWriter writer = new MultiFormatWriter();
+
+        Map<EncodeHintType, Object> encodeHints = new ArrayMap<>();
+        // We don't want to pass the ISO-8859-1 as an encoding hint as zxing may add this as ECI
+        // inside the barcode.
+        //
+        // Due to many barcode scanners in the wild being badly coded they may trip over ECI
+        // info existing and fail to scan.
+        // See:
+        // - https://github.com/CatimaLoyalty/Android/issues/2921
+        // - https://github.com/CatimaLoyalty/Android/issues/2932
+        //
+        // Just not always passing the encoding hint is slightly hacky, but in 5+ years of Catima
+        // cards without encode hints have never caused any issues (unless they were UTF-8), yet
+        // just days after passing ISO-8859-1 as CHARACTER_SET in the encode hints already 2
+        // scan failures were reported (one for QR, one for Aztec).
+        if (!Objects.equals(encoding.name(), StandardCharsets.ISO_8859_1.name())) {
+            Log.d(TAG, "Chosen encoding is not ISO_8859_1, so passing as encoding hint");
+            encodeHints.put(EncodeHintType.CHARACTER_SET, encoding);
+        } else {
+            Log.d(TAG, "Not passing encoding as encoding hint");
+        }
+
        BitMatrix bitMatrix;
        try {
            try {
-                bitMatrix = writer.encode(cardId, format.format(), imageWidth, imageHeight, null);
+                bitMatrix = writer.encode(cardId, format.format(), imageWidth, imageHeight, encodeHints);
            } catch (Exception e) {
                // Cast a wider net here and catch any exception, as there are some
                // cases where an encoder may fail if the data is invalid for the
@@ -10,6 +10,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;

+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;

 import protect.card_locker.async.TaskHandler;
@@ -74,6 +75,9 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
        return viewHolder.image.getTag() != null && (boolean) viewHolder.image.getTag();
    }

+    // FIXME: The examples in the selector activity are always rendering using ISO-8859-1, even if UTF-8 is the selected type
+    // This needs some refactoring to properly retrieve the barcode encoding when rendering an active barcode
+    // This is the case for example when editing an active card, pressing the "Edit barcode" button, then "More options" and then "Enter the barcode manually"
    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text) {
        final CatimaBarcode format = CatimaBarcode.fromName(formatType);

@@ -92,13 +96,13 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>

                            Log.d(TAG, "Generating barcode for type " + formatType);

-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true, false);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, StandardCharsets.ISO_8859_1, text, true, null, true, false);
                            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                        }
                    });
        } else {
            Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true, false);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, StandardCharsets.ISO_8859_1, text, true, null, true, false);
            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
        }
    }
@@ -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) {
-    }
 }
@@ -0,0 +1,42 @@
+package protect.card_locker
+
+import android.graphics.Color
+import android.os.Bundle
+import android.os.PersistableBundle
+import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatDelegate
+import protect.card_locker.preferences.Settings
+
+open class CatimaComponentActivity() : ComponentActivity() {
+    fun fixedEdgeToEdge() {
+        // Fix edge-to-edge
+        // When overriding onCreate this does not correctly get applied, which is why it is its own function
+
+        // We explicitly need to set the systemBarStyle ourselves, to prevent issues where Android
+        // for example renders white icons on top of a white statusbar (or black on black)
+        val settings = Settings(this)
+        val systemBarStyle = when (settings.theme) {
+            AppCompatDelegate.MODE_NIGHT_NO ->
+                SystemBarStyle.light(
+                    scrim = Color.TRANSPARENT,
+                    darkScrim = Color.TRANSPARENT,
+                )
+            AppCompatDelegate.MODE_NIGHT_YES ->
+                SystemBarStyle.dark(
+                    scrim = Color.TRANSPARENT,
+                )
+            else ->
+                SystemBarStyle.auto(
+                    lightScrim = Color.TRANSPARENT,
+                    darkScrim = Color.TRANSPARENT
+                )
+        }
+
+        enableEdgeToEdge(
+            statusBarStyle = systemBarStyle,
+            navigationBarStyle = systemBarStyle
+        )
+    }
+}
@@ -10,8 +10,12 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.text.TextUtils;
 import android.util.Log;

+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.io.FileNotFoundException;
 import java.math.BigDecimal;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Currency;
@@ -23,7 +27,7 @@ import java.util.Set;
 public class DBHelper extends SQLiteOpenHelper {
    public static final String DATABASE_NAME = "Catima.db";
    public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 17;
+    public static final int DATABASE_VERSION = 20;

    // NB: changing these values requires a migration
    public static final int DEFAULT_ZOOM_LEVEL = 100;
@@ -49,6 +53,7 @@ public class DBHelper extends SQLiteOpenHelper {
        public static final String CARD_ID = "cardid";
        public static final String BARCODE_ID = "barcodeid";
        public static final String BARCODE_TYPE = "barcodetype";
+        public static final String BARCODE_ENCODING = "barcodeencoding";
        public static final String STAR_STATUS = "starstatus";
        public static final String LAST_USED = "lastused";
        public static final String ZOOM_LEVEL = "zoomlevel";
@@ -71,6 +76,7 @@ public class DBHelper extends SQLiteOpenHelper {

    public enum LoyaltyCardOrder {
        Alpha,
+        LastAdded,
        LastUsed,
        ValidFrom,
        Expiry
@@ -112,6 +118,7 @@ public class DBHelper extends SQLiteOpenHelper {
                LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
                LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
+                LoyaltyCardDbIds.BARCODE_ENCODING + " TEXT not null," +
                LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
                LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
                LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL + "', " +
@@ -335,6 +342,160 @@ public class DBHelper extends SQLiteOpenHelper {
            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                    + " ADD COLUMN " + LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " INTEGER DEFAULT '100' ");
        }
+
+        if (oldVersion < 18 && newVersion >= 18) {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.BARCODE_ENCODING + " TEXT");
+        }
+
+        // On upgrade to 2.41.3, force all existing "Automatic" cards to ISO-8859-1.
+        // UTF-8 support was only added in 2.42.0, before that, all barcodes were saved without
+        // any encoding info. As many scanners deal badly with ECI info, automatically guessing
+        // UTF-8 for old barcodes may break them.
+        //
+        // New cards will be saved using either "Automatic" encoding to guess or, for pkpass files,
+        // whatever encoding is specified.
+        if (oldVersion < 19 && newVersion >= 19) {
+            db.execSQL("UPDATE " + LoyaltyCardDbIds.TABLE + " SET " + LoyaltyCardDbIds.BARCODE_ENCODING + " = 'ISO-8859-1' WHERE " + LoyaltyCardDbIds.BARCODE_ENCODING + " IS NULL");
+        }
+
+        if (oldVersion < 20 && newVersion >= 20) {
+            // SQLite doesn't support modify column
+            // So we need to create a temp column to make barcode encoding non-nullable
+            // https://www.sqlite.org/faq.html#q11
+            db.beginTransaction();
+
+            // First migrate all cards to ISO-8859-1
+            db.execSQL("UPDATE " + LoyaltyCardDbIds.TABLE + " SET " + LoyaltyCardDbIds.BARCODE_ENCODING + " = 'ISO-8859-1' WHERE " + LoyaltyCardDbIds.BARCODE_ENCODING + " IS NULL");
+
+            // create temp table
+            db.execSQL("CREATE TEMPORARY TABLE tmp (" +
+                    LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
+                    LoyaltyCardDbIds.STORE + " TEXT not null," +
+                    LoyaltyCardDbIds.NOTE + " TEXT not null," +
+                    LoyaltyCardDbIds.VALID_FROM + " INTEGER," +
+                    LoyaltyCardDbIds.EXPIRY + " INTEGER," +
+                    LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
+                    LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
+                    LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
+                    LoyaltyCardDbIds.BARCODE_ENCODING + " TEXT not null," +
+                    LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
+                    LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
+                    LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL + "', " +
+                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL_WIDTH + "', " +
+                    LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' )");
+
+            // Insert all cards into temp table
+            db.execSQL("INSERT INTO tmp (" +
+                    LoyaltyCardDbIds.ID + " ," +
+                    LoyaltyCardDbIds.STORE + " ," +
+                    LoyaltyCardDbIds.NOTE + " ," +
+                    LoyaltyCardDbIds.VALID_FROM + " , " +
+                    LoyaltyCardDbIds.EXPIRY + " ," +
+                    LoyaltyCardDbIds.BALANCE + " ," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
+                    LoyaltyCardDbIds.CARD_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
+                    LoyaltyCardDbIds.BARCODE_ENCODING + " ," +
+                    LoyaltyCardDbIds.STAR_STATUS + " ," +
+                    LoyaltyCardDbIds.LAST_USED + " ," +
+                    LoyaltyCardDbIds.ZOOM_LEVEL + " ," +
+                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " ," +
+                    LoyaltyCardDbIds.ARCHIVE_STATUS + ")" +
+                    " SELECT " +
+                    LoyaltyCardDbIds.ID + " ," +
+                    LoyaltyCardDbIds.STORE + " ," +
+                    LoyaltyCardDbIds.NOTE + " ," +
+                    LoyaltyCardDbIds.VALID_FROM + " ," +
+                    LoyaltyCardDbIds.EXPIRY + " ," +
+                    LoyaltyCardDbIds.BALANCE + " ," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
+                    LoyaltyCardDbIds.CARD_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
+                    LoyaltyCardDbIds.BARCODE_ENCODING + " ," +
+                    LoyaltyCardDbIds.STAR_STATUS + " ," +
+                    LoyaltyCardDbIds.LAST_USED + " ," +
+                    LoyaltyCardDbIds.ZOOM_LEVEL + " ," +
+                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " ," +
+                    LoyaltyCardDbIds.ARCHIVE_STATUS +
+                    " FROM " + LoyaltyCardDbIds.TABLE);
+
+            // Drop old table
+            db.execSQL("DROP TABLE " + LoyaltyCardDbIds.TABLE);
+
+            // Create table again
+            db.execSQL("CREATE TABLE " + LoyaltyCardDbIds.TABLE + "(" +
+                    LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
+                    LoyaltyCardDbIds.STORE + " TEXT not null," +
+                    LoyaltyCardDbIds.NOTE + " TEXT not null," +
+                    LoyaltyCardDbIds.VALID_FROM + " INTEGER," +
+                    LoyaltyCardDbIds.EXPIRY + " INTEGER," +
+                    LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
+                    LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
+                    LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
+                    LoyaltyCardDbIds.BARCODE_ENCODING + " TEXT not null," +
+                    LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
+                    LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
+                    LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL + "', " +
+                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL_WIDTH + "', " +
+                    LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' )");
+
+            // Insert all temp cards into newly created table
+            db.execSQL("INSERT INTO " + LoyaltyCardDbIds.TABLE + "(" +
+                    LoyaltyCardDbIds.ID + " ," +
+                    LoyaltyCardDbIds.STORE + " ," +
+                    LoyaltyCardDbIds.NOTE + " ," +
+                    LoyaltyCardDbIds.VALID_FROM + " , " +
+                    LoyaltyCardDbIds.EXPIRY + " ," +
+                    LoyaltyCardDbIds.BALANCE + " ," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
+                    LoyaltyCardDbIds.CARD_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
+                    LoyaltyCardDbIds.BARCODE_ENCODING + " ," +
+                    LoyaltyCardDbIds.STAR_STATUS + " ," +
+                    LoyaltyCardDbIds.LAST_USED + " ," +
+                    LoyaltyCardDbIds.ZOOM_LEVEL + " ," +
+                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " ," +
+                    LoyaltyCardDbIds.ARCHIVE_STATUS + ")" +
+                    " SELECT " +
+                    LoyaltyCardDbIds.ID + " ," +
+                    LoyaltyCardDbIds.STORE + " ," +
+                    LoyaltyCardDbIds.NOTE + " ," +
+                    LoyaltyCardDbIds.VALID_FROM + " ," +
+                    LoyaltyCardDbIds.EXPIRY + " ," +
+                    LoyaltyCardDbIds.BALANCE + " ," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
+                    LoyaltyCardDbIds.CARD_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
+                    LoyaltyCardDbIds.BARCODE_ENCODING + " ," +
+                    LoyaltyCardDbIds.STAR_STATUS + " ," +
+                    LoyaltyCardDbIds.LAST_USED + " ," +
+                    LoyaltyCardDbIds.ZOOM_LEVEL + " ," +
+                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " ," +
+                    LoyaltyCardDbIds.ARCHIVE_STATUS +
+                    " FROM tmp");
+
+            // Drop tmp table
+            db.execSQL("DROP TABLE tmp");
+
+            db.setTransactionSuccessful();
+            db.endTransaction();
+        }
+
    }

    public static Set<String> imageFiles(Context context, final SQLiteDatabase database) {
@@ -396,7 +557,8 @@ public class DBHelper extends SQLiteOpenHelper {
    public static long insertLoyaltyCard(
            final SQLiteDatabase database, final String store, final String note, final Date validFrom,
            final Date expiry, final BigDecimal balance, final Currency balanceType, final String cardId,
-            final String barcodeId, final CatimaBarcode barcodeType, final Integer headerColor,
+            final String barcodeId, final CatimaBarcode barcodeType, final @NonNull Charset barcodeEncoding,
+            final Integer headerColor,
            final int starStatus, final Long lastUsed, final int archiveStatus) {
        database.beginTransaction();

@@ -411,6 +573,7 @@ public class DBHelper extends SQLiteOpenHelper {
        contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ENCODING, barcodeEncoding.name());
        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
@@ -430,7 +593,8 @@ public class DBHelper extends SQLiteOpenHelper {
            final SQLiteDatabase database, final int id, final String store, final String note,
            final Date validFrom, final Date expiry, final BigDecimal balance,
            final Currency balanceType, final String cardId, final String barcodeId,
-            final CatimaBarcode barcodeType, final Integer headerColor, final int starStatus,
+            final CatimaBarcode barcodeType, final @NonNull Charset barcodeEncoding,
+            final Integer headerColor, final int starStatus,
            final Long lastUsed, final int archiveStatus) {
        database.beginTransaction();

@@ -446,6 +610,7 @@ public class DBHelper extends SQLiteOpenHelper {
        contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ENCODING, barcodeEncoding.name());
        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
@@ -465,7 +630,8 @@ public class DBHelper extends SQLiteOpenHelper {
            SQLiteDatabase database, final int id, final String store, final String note,
            final Date validFrom, final Date expiry, final BigDecimal balance,
            final Currency balanceType, final String cardId, final String barcodeId,
-            final CatimaBarcode barcodeType, final Integer headerColor, final int starStatus,
+            final CatimaBarcode barcodeType, final @NonNull Charset barcodeEncoding,
+            final Integer headerColor, final int starStatus,
            final Long lastUsed, final int archiveStatus) {
        database.beginTransaction();

@@ -480,6 +646,7 @@ public class DBHelper extends SQLiteOpenHelper {
        contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ENCODING, barcodeEncoding.name());
        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
@@ -923,6 +1090,10 @@ public class DBHelper extends SQLiteOpenHelper {
            return LoyaltyCardDbIds.STORE;
        }

+        if (order == LoyaltyCardOrder.LastAdded) {
+            return LoyaltyCardDbIds.ID;
+        }
+
        if (order == LoyaltyCardOrder.LastUsed) {
            return LoyaltyCardDbIds.LAST_USED;
        }
@@ -939,8 +1110,8 @@ public class DBHelper extends SQLiteOpenHelper {
    }

    private static String getDbDirection(LoyaltyCardOrder order, LoyaltyCardOrderDirection direction) {
-        if (order == LoyaltyCardOrder.LastUsed) {
-            // We want the default sorting to put the most recently used first
+        if (order == LoyaltyCardOrder.LastAdded || order == LoyaltyCardOrder.LastUsed) {
+            // We want the default sorting to put the most recently added/used first
            return direction == LoyaltyCardOrderDirection.Descending ? "ASC" : "DESC";
        }

@@ -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
@@ -4,11 +4,14 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;

+import androidx.annotation.Nullable;
+
 import java.io.InvalidObjectException;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Currency;
 import java.util.Date;
@@ -25,6 +28,7 @@ public class ImportURIHelper {
    private static final String CARD_ID = DBHelper.LoyaltyCardDbIds.CARD_ID;
    private static final String BARCODE_ID = DBHelper.LoyaltyCardDbIds.BARCODE_ID;
    private static final String BARCODE_TYPE = DBHelper.LoyaltyCardDbIds.BARCODE_TYPE;
+    private static final String BARCODE_ENCODING = DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING;
    private static final String HEADER_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_COLOR;

    private final Context context;
@@ -66,6 +70,7 @@ public class ImportURIHelper {
        try {
            // These values are allowed to be null
            CatimaBarcode barcodeType = null;
+            Charset barcodeEncoding = StandardCharsets.ISO_8859_1;
            Date validFrom = null;
            Date expiry = null;
            BigDecimal balance = new BigDecimal("0");
@@ -103,6 +108,11 @@ public class ImportURIHelper {
                barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
            }

+            String unparsedBarcodeEncoding = kv.get(BARCODE_ENCODING);
+            if (unparsedBarcodeEncoding != null && !unparsedBarcodeEncoding.equals("")) {
+                barcodeEncoding = Charset.forName(unparsedBarcodeEncoding);
+            }
+
            String unparsedBalance = kv.get(BALANCE);
            if (unparsedBalance != null && !unparsedBalance.equals("")) {
                balance = new BigDecimal(unparsedBalance);
@@ -136,6 +146,7 @@ public class ImportURIHelper {
                    cardId,
                    barcodeId,
                    barcodeType,
+                    barcodeEncoding,
                    headerColor,
                    0,
                    Utils.getUnixTime(),
@@ -195,6 +206,7 @@ public class ImportURIHelper {
        if (loyaltyCard.barcodeType != null) {
            fragment = appendFragment(fragment, BARCODE_TYPE, loyaltyCard.barcodeType.name());
        }
+        fragment = appendFragment(fragment, BARCODE_ENCODING, loyaltyCard.barcodeEncoding.name());
        if (loyaltyCard.headerColor != null) {
            fragment = appendFragment(fragment, HEADER_COLOR, loyaltyCard.headerColor.toString());
        }
@@ -1,140 +0,0 @@
-package protect.card_locker;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.Typeface;
-import android.text.TextPaint;
-import android.util.Log;
-
-import androidx.core.graphics.PaintCompat;
-
-/**
- * Original from https://github.com/andOTP/andOTP/blob/master/app/src/main/java/org/shadowice/flocke/andotp/Utilities/LetterBitmap.java
- * which was originally from http://stackoverflow.com/questions/23122088/colored-boxed-with-letters-a-la-gmail
- * Used to create a {@link Bitmap} that contains a letter used in the English
- * alphabet or digit, if there is no letter or digit available, a default image
- * is shown instead.
- */
-class LetterBitmap {
-    /**
-     * The letter bitmap
-     */
-    private final Bitmap mBitmap;
-    /**
-     * The background color of the letter bitmap
-     */
-    private final Integer mColor;
-
-    /**
-     * Constructor for <code>LetterTileProvider</code>
-     *
-     * @param context            The {@link Context} to use
-     * @param displayName        The name used to create the letter for the tile
-     * @param key                The key used to generate the background color for the tile
-     * @param tileLetterFontSize The font size used to display the letter
-     * @param width              The desired width of the tile
-     * @param height             The desired height of the tile
-     * @param backgroundColor    (optional) color to use for background.
-     * @param textColor          (optional) color to use for text.
-     */
-    public LetterBitmap(Context context, String displayName, String key, int tileLetterFontSize,
-                        int width, int height, Integer backgroundColor, Integer textColor) {
-        TextPaint paint = new TextPaint();
-
-        if (textColor != null) {
-            paint.setColor(textColor);
-        } else {
-            paint.setColor(Color.WHITE);
-        }
-
-        paint.setTextAlign(Paint.Align.CENTER);
-        paint.setAntiAlias(true);
-        paint.setTextSize(tileLetterFontSize);
-        paint.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
-
-        if (backgroundColor == null) {
-            mColor = getDefaultColor(context, key);
-        } else {
-            mColor = backgroundColor;
-        }
-
-        mBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        String firstChar = displayName.substring(0, 1).toUpperCase();
-        int firstCharEnd = 2;
-        while (firstCharEnd <= displayName.length()) {
-            // Test for the longest render-able string
-            // But ignore containing only a-Z0-9 to not render things like ffi as a single character
-            String test = displayName.substring(0, firstCharEnd);
-            if (!isAlphabetical(test) && PaintCompat.hasGlyph(paint, test)) {
-                firstChar = test;
-            }
-            firstCharEnd++;
-        }
-
-        Log.d("LetterBitmap", "using sequence " + firstChar + " to render first char which has length " + firstChar.length());
-
-        final Canvas c = new Canvas();
-        c.setBitmap(mBitmap);
-        c.drawColor(mColor);
-
-        Rect bounds = new Rect();
-        paint.getTextBounds(firstChar, 0, firstChar.length(), bounds);
-        c.drawText(firstChar,
-                0, firstChar.length(),
-                width / 2.0f, (height - (bounds.bottom + bounds.top)) / 2.0f
-                , paint);
-
-    }
-
-    /**
-     * @return A {@link Bitmap} that contains a letter used in the English
-     * alphabet or digit, if there is no letter or digit available, a
-     * default image is shown instead
-     */
-    public Bitmap getLetterTile() {
-        return mBitmap;
-    }
-
-    /**
-     * @return background color used for letter title.
-     */
-    public int getBackgroundColor() {
-        return mColor;
-    }
-
-    /**
-     * @param key The key used to generate the tile color
-     * @return A new or previously chosen color for <code>key</code> used as the
-     * tile background color
-     */
-    private static int pickColor(String key, TypedArray colors) {
-        // String.hashCode() is not supposed to change across java versions, so
-        // this should guarantee the same key always maps to the same color
-        final int color = Math.abs(key.hashCode()) % colors.length();
-        return colors.getColor(color, Color.BLACK);
-    }
-
-    private static boolean isAlphabetical(String string) {
-        return string.matches("[a-zA-Z0-9]*");
-    }
-
-    /**
-     * Determine the color which the letter tile will use if no default
-     * color is provided.
-     */
-    public static int getDefaultColor(Context context, String key) {
-        final Resources res = context.getResources();
-
-        TypedArray colors = res.obtainTypedArray(R.array.letter_tile_colors);
-        int color = pickColor(key, colors);
-        colors.recycle();
-
-        return color;
-    }
-}
@@ -0,0 +1,136 @@
+package protect.card_locker
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.Rect
+import android.graphics.Typeface
+import android.text.TextPaint
+import android.util.Log
+import androidx.core.graphics.PaintCompat
+import java.util.Locale
+import kotlin.math.abs
+
+/**
+ * Original from https://github.com/andOTP/andOTP/blob/master/app/src/main/java/org/shadowice/flocke/andotp/Utilities/LetterBitmap.java
+ * which was originally from http://stackoverflow.com/questions/23122088/colored-boxed-with-letters-a-la-gmail
+ * Used to create a {@link Bitmap} that contains a letter used in the English
+ * alphabet or digit, if there is no letter or digit available, a default image
+ * is shown instead.
+ *
+ * @constructor Constructor for <code>LetterTileProvider</code>
+ * @param context            The {@link Context} to use
+ * @param displayName        The name used to create the letter for the tile
+ * @param key                The key used to generate the background color for the tile
+ * @param tileLetterFontSize The font size used to display the letter
+ * @param width              The desired width of the tile
+ * @param height             The desired height of the tile
+ * @param backgroundColor    (optional) color to use for background.
+ * @param textColor          (optional) color to use for text.
+ */
+class LetterBitmap(
+    context: Context, displayName: String, key: String, tileLetterFontSize: Int,
+    width: Int, height: Int, backgroundColor: Int?, textColor: Int?
+) {
+    /**
+     * A {@link Bitmap} that contains a letter used in the English
+     * alphabet or digit, if there is no letter or digit available, a
+     * default image is shown instead
+     */
+    private val letterTile: Bitmap
+
+    /**
+     * The background color of the letter bitmap
+     */
+    private val mColor: Int
+
+    init {
+        val paint = TextPaint().apply {
+            color = textColor ?: Color.WHITE
+            textAlign = Paint.Align.CENTER
+            isAntiAlias = true
+            textSize = tileLetterFontSize.toFloat()
+            typeface = Typeface.defaultFromStyle(Typeface.BOLD)
+        }
+
+        mColor = backgroundColor ?: getDefaultColor(context, key)
+
+        this.letterTile = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+
+        var firstChar = displayName.substring(0, 1).uppercase(Locale.getDefault())
+        var firstCharEnd = 2
+        while (firstCharEnd <= displayName.length) {
+            // Test for the longest render-able string
+            // But ignore containing only a-Z0-9 to not render things like ffi as a single character
+            val test = displayName.substring(0, firstCharEnd)
+            if (!isAlphabetical(test) && PaintCompat.hasGlyph(paint, test)) {
+                firstChar = test
+            }
+            firstCharEnd++
+        }
+
+        Log.d(
+            "LetterBitmap",
+            "using sequence $firstChar to render first char which has length ${firstChar.length}"
+        )
+
+        Canvas().apply {
+            setBitmap(this@LetterBitmap.letterTile)
+            drawColor(mColor)
+
+            val bounds = Rect()
+            paint.getTextBounds(firstChar, 0, firstChar.length, bounds)
+            drawText(
+                firstChar,
+                0, firstChar.length,
+                width / 2.0f, (height - (bounds.bottom + bounds.top)) / 2.0f,
+                paint
+            )
+        }
+    }
+
+    val backgroundColor: Int
+        /**
+         * @return background color used for letter title.
+         */
+        get() = mColor
+    
+    fun getLetterTile(): Bitmap {
+        return letterTile
+    }
+
+    companion object {
+        /**
+         * @param key The key used to generate the tile color
+         * @return A new or previously chosen color for `key` used as the
+         * tile background color
+         */
+        private fun pickColor(key: String, colors: TypedArray): Int {
+            // String.hashCode() is not supposed to change across java versions, so
+            // this should guarantee the same key always maps to the same color
+            val color = abs(key.hashCode()) % colors.length()
+            return colors.getColor(color, Color.BLACK)
+        }
+
+        private fun isAlphabetical(string: String): Boolean {
+            return string.matches("[a-zA-Z0-9]*".toRegex())
+        }
+
+        /**
+         * Determine the color which the letter tile will use if no default
+         * color is provided.
+         */
+        fun getDefaultColor(context: Context, key: String): Int {
+            val res = context.resources
+
+            val colors = res.obtainTypedArray(R.array.letter_tile_colors)
+            val color: Int = pickColor(key, colors)
+            colors.recycle()
+
+            return color
+        }
+    }
+}
@@ -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) {
@@ -69,7 +70,9 @@ class ListWidget : AppWidgetProvider() {
            if (hasCards) {
                // If we have cards, create the list
                views = RemoteViews(context.packageName, R.layout.list_widget)
-                val templateIntent = Intent(context, LoyaltyCardViewActivity::class.java)
+                val templateIntent = Intent(context, LoyaltyCardViewActivity::class.java).apply {
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                }
                val pendingIntent = PendingIntent.getActivity(
                    context,
                    0,
@@ -100,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))
@@ -128,4 +130,4 @@ class ListWidget : AppWidgetProvider() {

        return remoteViews
    }
-}
+}
@@ -9,6 +9,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

 import java.math.BigDecimal;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Currency;
 import java.util.Date;
 import java.util.List;
@@ -30,6 +32,7 @@ public class LoyaltyCard {
    public String barcodeId;
    @Nullable
    public CatimaBarcode barcodeType;
+    public Charset barcodeEncoding;
    @Nullable
    public Integer headerColor;
    public int starStatus;
@@ -62,6 +65,7 @@ public class LoyaltyCard {
    public static final String BUNDLE_LOYALTY_CARD_CARD_ID = "loyaltyCardCardId";
    public static final String BUNDLE_LOYALTY_CARD_BARCODE_ID = "loyaltyCardBarcodeId";
    public static final String BUNDLE_LOYALTY_CARD_BARCODE_TYPE = "loyaltyCardBarcodeType";
+    public static final String BUNDLE_LOYALTY_CARD_BARCODE_ENCODING = "loyaltyCardBarcodeEncoding";
    public static final String BUNDLE_LOYALTY_CARD_HEADER_COLOR = "loyaltyCardHeaderColor";
    public static final String BUNDLE_LOYALTY_CARD_STAR_STATUS = "loyaltyCardStarStatus";
    public static final String BUNDLE_LOYALTY_CARD_LAST_USED = "loyaltyCardLastUsed";
@@ -90,6 +94,7 @@ public class LoyaltyCard {
        setCardId("");
        setBarcodeId(null);
        setBarcodeType(null);
+        setBarcodeEncoding(StandardCharsets.ISO_8859_1);
        setHeaderColor(null);
        setStarStatus(0);
        setLastUsed(Utils.getUnixTime());
@@ -124,7 +129,7 @@ public class LoyaltyCard {
    public LoyaltyCard(final int id, final String store, final String note, @Nullable final Date validFrom,
                       @Nullable final Date expiry, final BigDecimal balance, @Nullable final Currency balanceType,
                       final String cardId, @Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType,
-                       @Nullable final Integer headerColor, final int starStatus,
+                       @NonNull final Charset barcodeEncoding, @Nullable final Integer headerColor, final int starStatus,
                       final long lastUsed, final int zoomLevel, final int zoomLevelWidth, final int archiveStatus,
                       @Nullable Bitmap imageThumbnail, @Nullable String imageThumbnailPath,
                       @Nullable Bitmap imageFront, @Nullable String imageFrontPath,
@@ -139,6 +144,7 @@ public class LoyaltyCard {
        setCardId(cardId);
        setBarcodeId(barcodeId);
        setBarcodeType(barcodeType);
+        setBarcodeEncoding(barcodeEncoding);
        setHeaderColor(headerColor);
        setStarStatus(starStatus);
        setLastUsed(lastUsed);
@@ -244,6 +250,10 @@ public class LoyaltyCard {
        this.barcodeType = barcodeType;
    }

+    public void setBarcodeEncoding(@NonNull Charset barcodeEncoding) {
+        this.barcodeEncoding = barcodeEncoding;
+    }
+
    public void setHeaderColor(@Nullable Integer headerColor) {
        this.headerColor = headerColor;
    }
@@ -379,6 +389,11 @@ public class LoyaltyCard {
        } else if (requireFull) {
            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_BARCODE_TYPE);
        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING)) {
+            setBarcodeEncoding(Charset.forName(bundle.getString(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING)));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_BARCODE_ENCODING);
+        }
        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_HEADER_COLOR)) {
            int tmpHeaderColor = bundle.getInt(BUNDLE_LOYALTY_CARD_HEADER_COLOR);
            setHeaderColor(tmpHeaderColor != -1 ? tmpHeaderColor : null);
@@ -462,6 +477,9 @@ public class LoyaltyCard {
        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BARCODE_TYPE)) {
            bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING, barcodeEncoding.name());
+        }
        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_HEADER_COLOR)) {
            bundle.putInt(BUNDLE_LOYALTY_CARD_HEADER_COLOR, headerColor != null ? headerColor : -1);
        }
@@ -539,6 +557,8 @@ public class LoyaltyCard {
        // barcodeType
        int barcodeTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
        CatimaBarcode barcodeType = !cursor.isNull(barcodeTypeColumn) ? CatimaBarcode.fromName(cursor.getString(barcodeTypeColumn)) : null;
+        // barcodeEncoding
+        Charset barcodeEncoding = Charset.forName(cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING)));
        // headerColor
        int headerColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR);
        Integer headerColor = !cursor.isNull(headerColorColumn) ? cursor.getInt(headerColorColumn) : null;
@@ -564,6 +584,7 @@ public class LoyaltyCard {
                cardId,
                barcodeId,
                barcodeType,
+                barcodeEncoding,
                headerColor,
                starStatus,
                lastUsed,
@@ -593,6 +614,7 @@ public class LoyaltyCard {
                Utils.equals(a.barcodeId, b.barcodeId) && // nullable String
                Utils.equals(a.barcodeType == null ? null : a.barcodeType.format(),
                        b.barcodeType == null ? null : b.barcodeType.format()) && // nullable CatimaBarcode with no overridden .equals(), so we need to check .format()
+                a.barcodeEncoding.name().equals(b.barcodeEncoding.name()) && // non-nullable String
                Utils.equals(a.headerColor, b.headerColor) && // nullable Integer
                a.starStatus == b.starStatus && // non-nullable int
                a.archiveStatus == b.archiveStatus && // non-nullable int
@@ -619,7 +641,7 @@ public class LoyaltyCard {
    public String toString() {
        return String.format(
                "LoyaltyCard{%n  id=%s,%n  store=%s,%n  note=%s,%n  validFrom=%s,%n  expiry=%s,%n"
-                        + "  balance=%s,%n  balanceType=%s,%n  cardId=%s,%n  barcodeId=%s,%n  barcodeType=%s,%n"
+                        + "  balance=%s,%n  balanceType=%s,%n  cardId=%s,%n  barcodeId=%s,%n  barcodeType=%s,%n barcodeEncoding=%s,%n"
                        + "  headerColor=%s,%n  starStatus=%s,%n  lastUsed=%s,%n  zoomLevel=%s,%n  zoomLevelWidth=%s,%n  archiveStatus=%s%n"
                        + "  imageThumbnail=%s,%n  imageThumbnailPath=%s,%n  imageFront=%s,%n  imageFrontPath=%s,%n  imageBack=%s,%n  imageBackPath=%s,%n}",
                this.id,
@@ -632,6 +654,7 @@ public class LoyaltyCard {
                this.cardId,
                this.barcodeId,
                this.barcodeType != null ? this.barcodeType.format() : null,
+                this.barcodeEncoding.name(),
                this.headerColor,
                this.starStatus,
                this.lastUsed,
@@ -105,6 +105,12 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            inputHolder.setNoteField(null);
        }

+        if (mLoyaltyCardListDisplayOptions.showingCardId() && !loyaltyCard.cardId.isEmpty()) {
+            inputHolder.setExtraField(inputHolder.mCardIdField, loyaltyCard.cardId, null, showDivider);
+        } else {
+            inputHolder.setExtraField(inputHolder.mCardIdField, null, null, false);
+        }
+
        if (mLoyaltyCardListDisplayOptions.showingBalance() && !loyaltyCard.balance.equals(new BigDecimal("0"))) {
            inputHolder.setExtraField(inputHolder.mBalanceField, Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType), null, showDivider);
        } else {
@@ -211,7 +217,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso

    public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {

-        public TextView mCardText, mStoreField, mNoteField, mBalanceField, mValidFromField, mExpiryField;
+        public TextView mCardText, mStoreField, mNoteField, mCardIdField, mBalanceField, mValidFromField, mExpiryField;
        public ImageView mCardIcon, mTickIcon;
        public MaterialCardView mRow;
        public ConstraintLayout mStar, mArchived;
@@ -224,6 +230,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            mDivider = loyaltyCardLayoutBinding.infoDivider;
            mStoreField = loyaltyCardLayoutBinding.store;
            mNoteField = loyaltyCardLayoutBinding.note;
+            mCardIdField = loyaltyCardLayoutBinding.cardId;
            mBalanceField = loyaltyCardLayoutBinding.balance;
            mValidFromField = loyaltyCardLayoutBinding.validFrom;
            mExpiryField = loyaltyCardLayoutBinding.expiry;
@@ -70,6 +70,8 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.math.BigDecimal;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -123,11 +125,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
    ChipGroup groupsChips;
    AutoCompleteTextView validFromField;
    AutoCompleteTextView expiryField;
-    EditText balanceField;
    AutoCompleteTextView balanceCurrencyField;
+    EditText balanceField;
    TextView cardIdFieldView;
    AutoCompleteTextView barcodeIdField;
    AutoCompleteTextView barcodeTypeField;
+    AutoCompleteTextView barcodeEncodingField;
    ImageView barcodeImage;
    View barcodeImageLayout;
    View barcodeCaptureLayout;
@@ -148,9 +151,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
    boolean onRestoring = false;
    AlertDialog confirmExitDialog = null;

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

    ActivityResultLauncher<Uri> mPhotoTakerLauncher;
    ActivityResultLauncher<Intent> mPhotoPickerLauncher;
@@ -193,14 +196,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        viewModel.setHasChanged(true);
    }

-    protected void setLoyaltyCardBalance(@NonNull BigDecimal balance) {
-        viewModel.getLoyaltyCard().setBalance(balance);
+    protected void setLoyaltyCardBalanceType(@Nullable Currency balanceType) {
+        viewModel.getLoyaltyCard().setBalanceType(balanceType);

        viewModel.setHasChanged(true);
    }

-    protected void setLoyaltyCardBalanceType(@Nullable Currency balanceType) {
-        viewModel.getLoyaltyCard().setBalanceType(balanceType);
+    protected void setLoyaltyCardBalance(@NonNull BigDecimal balance) {
+        viewModel.getLoyaltyCard().setBalance(balance);

        viewModel.setHasChanged(true);
    }
@@ -229,6 +232,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        viewModel.setHasChanged(true);
    }

+    protected void setLoyaltyCardBarcodeEncoding(@NonNull Charset barcodeEncoding) {
+        viewModel.getLoyaltyCard().setBarcodeEncoding(barcodeEncoding);
+
+        generateBarcode();
+
+        viewModel.setHasChanged(true);
+    }
+
    protected void setLoyaltyCardHeaderColor(@Nullable Integer headerColor) {
        viewModel.getLoyaltyCard().setHeaderColor(headerColor);

@@ -329,11 +340,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        groupsChips = binding.groupChips;
        validFromField = binding.validFromField;
        expiryField = binding.expiryField;
-        balanceField = binding.balanceField;
        balanceCurrencyField = binding.balanceCurrencyField;
+        balanceField = binding.balanceField;
        cardIdFieldView = binding.cardIdView;
        barcodeIdField = binding.barcodeIdField;
        barcodeTypeField = binding.barcodeTypeField;
+        barcodeEncodingField = binding.barcodeEncodingField;
        barcodeImage = binding.barcode;
        barcodeImage.setClipToOutline(true);
        barcodeImageLayout = binding.barcodeLayout;
@@ -373,33 +385,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements

        setMaterialDatePickerResultListener();

-        balanceField.setOnFocusChangeListener((v, hasFocus) -> {
-            if (!hasFocus && !onResuming && !onRestoring) {
-                if (balanceField.getText().toString().isEmpty()) {
-                    setLoyaltyCardBalance(BigDecimal.valueOf(0));
-                }
-
-                balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType));
-            }
-        });
-
-        balanceField.addTextChangedListener(new SimpleTextWatcher() {
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (onResuming || onRestoring) return;
-                try {
-                    BigDecimal balance = Utils.parseBalance(s.toString(), viewModel.getLoyaltyCard().balanceType);
-                    setLoyaltyCardBalance(balance);
-                    balanceField.setError(null);
-                    validBalance = true;
-                } catch (ParseException e) {
-                    e.printStackTrace();
-                    balanceField.setError(getString(R.string.balanceParsingFailed));
-                    validBalance = false;
-                }
-            }
-        });
-
        balanceCurrencyField.addTextChangedListener(new SimpleTextWatcher() {
            @Override
            public void onTextChanged(CharSequence s, int start, int before, int count) {
@@ -452,6 +437,33 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
            }
        });

+        balanceField.setOnFocusChangeListener((v, hasFocus) -> {
+            if (!hasFocus && !onResuming && !onRestoring) {
+                if (balanceField.getText().toString().isEmpty()) {
+                    setLoyaltyCardBalance(BigDecimal.valueOf(0));
+                }
+
+                balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType));
+            }
+        });
+
+        balanceField.addTextChangedListener(new SimpleTextWatcher() {
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (onResuming || onRestoring) return;
+                try {
+                    BigDecimal balance = Utils.parseBalance(s.toString(), viewModel.getLoyaltyCard().balanceType);
+                    setLoyaltyCardBalance(balance);
+                    balanceField.setError(null);
+                    validBalance = true;
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                    balanceField.setError(getString(R.string.balanceParsingFailed));
+                    validBalance = false;
+                }
+            }
+        });
+
        cardIdFieldView.addTextChangedListener(new SimpleTextWatcher() {
            @Override
            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -577,6 +589,25 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
            }
        });

+        barcodeEncodingField.addTextChangedListener(new SimpleTextWatcher() {
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (!s.toString().isEmpty()) {
+                    Log.d(TAG, "Setting barcode encoding to " + s.toString());
+                    setLoyaltyCardBarcodeEncoding(Charset.forName(s.toString()));
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                ArrayList<String> barcodeEncodingList = new ArrayList<>();
+                barcodeEncodingList.add(StandardCharsets.ISO_8859_1.name());
+                barcodeEncodingList.add(StandardCharsets.UTF_8.name());
+                ArrayAdapter<String> barcodeEncodingAdapter = new ArrayAdapter<>(LoyaltyCardEditActivity.this, android.R.layout.select_dialog_item, barcodeEncodingList);
+                barcodeEncodingField.setAdapter(barcodeEncodingAdapter);
+            }
+        });
+
        binding.tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
            @Override
            public void onTabSelected(TabLayout.Tab tab) {
@@ -688,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);
@@ -773,6 +812,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        barcodeIdField.setText(barcodeId != null && !barcodeId.isEmpty() ? barcodeId : getString(R.string.sameAsCardId));
        CatimaBarcode barcodeType = viewModel.getLoyaltyCard().barcodeType;
        barcodeTypeField.setText(barcodeType != null ? barcodeType.prettyName() : getString(R.string.noBarcode));
+        Charset barcodeEncoding = viewModel.getLoyaltyCard().barcodeEncoding;
+        barcodeEncodingField.setText(barcodeEncoding.name());

        // We set the balance here (with onResuming/onRestoring == true) to prevent formatBalanceCurrencyField() from setting it (via onTextChanged),
        // which can cause issues when switching locale because it parses the balance and e.g. the decimal separator may have changed.
@@ -1479,9 +1520,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        // This makes the DBHelper set it to the current date
        // So that new and edited card are always on top when sorting by recently used
        if (viewModel.getUpdateLoyaltyCard()) {
-            DBHelper.updateLoyaltyCard(mDatabase, viewModel.getLoyaltyCardId(), viewModel.getLoyaltyCard().store, viewModel.getLoyaltyCard().note, viewModel.getLoyaltyCard().validFrom, viewModel.getLoyaltyCard().expiry, viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType, viewModel.getLoyaltyCard().cardId, viewModel.getLoyaltyCard().barcodeId, viewModel.getLoyaltyCard().barcodeType, viewModel.getLoyaltyCard().headerColor, viewModel.getLoyaltyCard().starStatus, null, viewModel.getLoyaltyCard().archiveStatus);
+            DBHelper.updateLoyaltyCard(mDatabase, viewModel.getLoyaltyCardId(), viewModel.getLoyaltyCard().store, viewModel.getLoyaltyCard().note, viewModel.getLoyaltyCard().validFrom, viewModel.getLoyaltyCard().expiry, viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType, viewModel.getLoyaltyCard().cardId, viewModel.getLoyaltyCard().barcodeId, viewModel.getLoyaltyCard().barcodeType, viewModel.getLoyaltyCard().barcodeEncoding, viewModel.getLoyaltyCard().headerColor, viewModel.getLoyaltyCard().starStatus, null, viewModel.getLoyaltyCard().archiveStatus);
        } else {
-            viewModel.setLoyaltyCardId((int) DBHelper.insertLoyaltyCard(mDatabase, viewModel.getLoyaltyCard().store, viewModel.getLoyaltyCard().note, viewModel.getLoyaltyCard().validFrom, viewModel.getLoyaltyCard().expiry, viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType, viewModel.getLoyaltyCard().cardId, viewModel.getLoyaltyCard().barcodeId, viewModel.getLoyaltyCard().barcodeType, viewModel.getLoyaltyCard().headerColor, 0, null, 0));
+            viewModel.setLoyaltyCardId((int) DBHelper.insertLoyaltyCard(mDatabase, viewModel.getLoyaltyCard().store, viewModel.getLoyaltyCard().note, viewModel.getLoyaltyCard().validFrom, viewModel.getLoyaltyCard().expiry, viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType, viewModel.getLoyaltyCard().cardId, viewModel.getLoyaltyCard().barcodeId, viewModel.getLoyaltyCard().barcodeType, viewModel.getLoyaltyCard().barcodeEncoding, viewModel.getLoyaltyCard().headerColor, 0, null, 0));
        }

        try {
@@ -1494,7 +1535,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements

        DBHelper.setLoyaltyCardGroups(mDatabase, viewModel.getLoyaltyCardId(), selectedGroups);

-        ShortcutHelper.updateShortcuts(this, DBHelper.getLoyaltyCard(this, mDatabase, viewModel.getLoyaltyCardId()));
+        ShortcutHelper.updateShortcuts(this);

        if (viewModel.getDuplicateFromLoyaltyCardId()) {
            Intent intent = new Intent(getApplicationContext(), MainActivity.class);
@@ -1596,6 +1637,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements

        String cardIdString = viewModel.getLoyaltyCard().barcodeId != null ? viewModel.getLoyaltyCard().barcodeId : viewModel.getLoyaltyCard().cardId;
        CatimaBarcode barcodeFormat = viewModel.getLoyaltyCard().barcodeType;
+        Charset barcodeEncoding = viewModel.getLoyaltyCard().barcodeEncoding;

        if (cardIdString == null || cardIdString.isEmpty() || barcodeFormat == null) {
            barcodeImageLayout.setVisibility(View.GONE);
@@ -1615,13 +1657,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                            barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);

                            Log.d(TAG, "ImageView size now known");
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, LoyaltyCardEditActivity.this, true, false);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, barcodeEncoding, null, false, LoyaltyCardEditActivity.this, true, false);
                            viewModel.getTaskHandler().executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                        }
                    });
        } else {
            Log.d(TAG, "ImageView size known known, creating barcode");
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, this, true, false);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, barcodeEncoding, null, false, this, true, false);
            viewModel.getTaskHandler().executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
        }
    }
@@ -35,6 +35,7 @@ public class LoyaltyCardListDisplayOptionsManager {

    private boolean mShowNameBelowThumbnail;
    private boolean mShowNote;
+    private boolean mShowCardId;
    private boolean mShowBalance;
    private boolean mShowValidity;
    private boolean mShowArchivedCards;
@@ -50,6 +51,7 @@ public class LoyaltyCardListDisplayOptionsManager {
                Context.MODE_PRIVATE);
        mShowNameBelowThumbnail = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_name_below_thumbnail), false);
        mShowNote = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_note), true);
+        mShowCardId = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_card_id), false);
        mShowBalance = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_balance), true);
        mShowValidity = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_validity), true);
        mShowArchivedCards = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_archived_cards), true);
@@ -83,6 +85,17 @@ public class LoyaltyCardListDisplayOptionsManager {
        return mShowNote;
    }

+    public void showCardId(boolean show) {
+        mShowCardId = show;
+        mRefreshCardsCallback.run();
+
+        saveDetailState(R.string.sharedpreference_card_details_show_card_id, show);
+    }
+
+    public boolean showingCardId() {
+        return mShowCardId;
+    }
+
    public void showBalance(boolean show) {
        mShowBalance = show;
        mRefreshCardsCallback.run();
@@ -137,6 +150,11 @@ public class LoyaltyCardListDisplayOptionsManager {
                showingNote(),
                this::showNote
        ));
+        displayOptions.add(new LoyaltyCardDisplayOption(
+                mContext.getString(R.string.show_card_id),
+                showingCardId(),
+                this::showCardId
+        ));
        displayOptions.add(new LoyaltyCardDisplayOption(
                mContext.getString(R.string.show_balance),
                showingBalance(),
@@ -1,882 +0,0 @@
-package protect.card_locker;
-
-import android.app.Activity;
-import android.app.SearchManager;
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.database.CursorIndexOutOfBoundsException;
-import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.Toast;
-
-import androidx.activity.OnBackPressedCallback;
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.view.ActionMode;
-import androidx.appcompat.widget.SearchView;
-import androidx.core.splashscreen.SplashScreen;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.tabs.TabLayout;
-
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import protect.card_locker.databinding.ContentMainBinding;
-import protect.card_locker.databinding.MainActivityBinding;
-import protect.card_locker.databinding.SortingOptionBinding;
-import protect.card_locker.preferences.Settings;
-import protect.card_locker.preferences.SettingsActivity;
-
-public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
-    private MainActivityBinding binding;
-    private ContentMainBinding contentMainBinding;
-    private static final String TAG = "Catima";
-    public static final String RESTART_ACTIVITY_INTENT = "restart_activity_intent";
-
-    private static final int MEDIUM_SCALE_FACTOR_DIP = 460;
-    static final String STATE_SEARCH_QUERY = "SEARCH_QUERY";
-
-    private SQLiteDatabase mDatabase;
-    private LoyaltyCardCursorAdapter mAdapter;
-    private ActionMode mCurrentActionMode;
-    private SearchView mSearchView;
-    private int mLoyaltyCardCount = 0;
-    protected String mFilter = "";
-    private String currentQuery = "";
-    private String finalQuery = "";
-    protected Object mGroup = null;
-    protected DBHelper.LoyaltyCardOrder mOrder = DBHelper.LoyaltyCardOrder.Alpha;
-    protected DBHelper.LoyaltyCardOrderDirection mOrderDirection = DBHelper.LoyaltyCardOrderDirection.Ascending;
-    protected int selectedTab = 0;
-    private RecyclerView mCardList;
-    private View mHelpSection;
-    private View mNoMatchingCardsText;
-    private View mNoGroupCardsText;
-    private TabLayout groupsTabLayout;
-    private Runnable mUpdateLoyaltyCardListRunnable;
-    private ActivityResultLauncher<Intent> mBarcodeScannerLauncher;
-    private ActivityResultLauncher<Intent> mSettingsLauncher;
-
-    private ActionMode.Callback mCurrentActionModeCallback = new ActionMode.Callback() {
-        @Override
-        public boolean onCreateActionMode(ActionMode inputMode, Menu inputMenu) {
-            inputMode.getMenuInflater().inflate(R.menu.card_longclick_menu, inputMenu);
-            return true;
-        }
-
-        @Override
-        public boolean onPrepareActionMode(ActionMode inputMode, Menu inputMenu) {
-            return false;
-        }
-
-        @Override
-        public boolean onActionItemClicked(ActionMode inputMode, MenuItem inputItem) {
-            if (inputItem.getItemId() == R.id.action_share) {
-                final ImportURIHelper importURIHelper = new ImportURIHelper(MainActivity.this);
-                try {
-                    importURIHelper.startShareIntent(mAdapter.getSelectedItems());
-                } catch (UnsupportedEncodingException e) {
-                    Toast.makeText(MainActivity.this, R.string.failedGeneratingShareURL, Toast.LENGTH_LONG).show();
-                    e.printStackTrace();
-                }
-                inputMode.finish();
-                return true;
-            } else if (inputItem.getItemId() == R.id.action_edit) {
-                if (mAdapter.getSelectedItemCount() != 1) {
-                    throw new IllegalArgumentException("Cannot edit more than 1 card at a time");
-                }
-
-                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-                Bundle bundle = new Bundle();
-                bundle.putInt(LoyaltyCardEditActivity.BUNDLE_ID, mAdapter.getSelectedItems().get(0).id);
-                bundle.putBoolean(LoyaltyCardEditActivity.BUNDLE_UPDATE, true);
-                intent.putExtras(bundle);
-                startActivity(intent);
-                inputMode.finish();
-                return true;
-            } else if (inputItem.getItemId() == R.id.action_delete) {
-                AlertDialog.Builder builder = new MaterialAlertDialogBuilder(MainActivity.this);
-                // The following may seem weird, but it is necessary to give translators enough flexibility.
-                // For example, in Russian, Android's plural quantity "one" actually refers to "any number ending on 1 but not ending in 11".
-                // So while in English the extra non-plural form seems unnecessary duplication, it is necessary to give translators enough flexibility.
-                // In here, we use the plain string when meaning exactly 1, and otherwise use the plural forms
-                if (mAdapter.getSelectedItemCount() == 1) {
-                    builder.setTitle(R.string.deleteTitle);
-                    builder.setMessage(R.string.deleteConfirmation);
-                } else {
-                    builder.setTitle(getResources().getQuantityString(R.plurals.deleteCardsTitle, mAdapter.getSelectedItemCount(), mAdapter.getSelectedItemCount()));
-                    builder.setMessage(getResources().getQuantityString(R.plurals.deleteCardsConfirmation, mAdapter.getSelectedItemCount(), mAdapter.getSelectedItemCount()));
-                }
-
-                builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
-                    for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-                        Log.d(TAG, "Deleting card: " + loyaltyCard.id);
-
-                        DBHelper.deleteLoyaltyCard(mDatabase, MainActivity.this, loyaltyCard.id);
-
-                        ShortcutHelper.removeShortcut(MainActivity.this, loyaltyCard.id);
-                    }
-
-                    TabLayout.Tab tab = groupsTabLayout.getTabAt(selectedTab);
-                    mGroup = tab != null ? tab.getTag() : null;
-
-                    updateLoyaltyCardList(true);
-
-                    dialog.dismiss();
-                });
-                builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
-                AlertDialog dialog = builder.create();
-                dialog.show();
-
-                return true;
-            } else if (inputItem.getItemId() == R.id.action_archive) {
-                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-                    Log.d(TAG, "Archiving card: " + loyaltyCard.id);
-                    DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id, 1);
-                    ShortcutHelper.removeShortcut(MainActivity.this, loyaltyCard.id);
-                    updateLoyaltyCardList(false);
-                    inputMode.finish();
-                    invalidateOptionsMenu();
-                }
-                return true;
-            } else if (inputItem.getItemId() == R.id.action_unarchive) {
-                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-                    Log.d(TAG, "Unarchiving card: " + loyaltyCard.id);
-                    DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id, 0);
-                    updateLoyaltyCardList(false);
-                    inputMode.finish();
-                    invalidateOptionsMenu();
-                }
-                return true;
-            } else if (inputItem.getItemId() == R.id.action_star) {
-                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-                    Log.d(TAG, "Starring card: " + loyaltyCard.id);
-                    DBHelper.updateLoyaltyCardStarStatus(mDatabase, loyaltyCard.id, 1);
-                    updateLoyaltyCardList(false);
-                    inputMode.finish();
-                }
-                return true;
-            } else if (inputItem.getItemId() == R.id.action_unstar) {
-                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-                    Log.d(TAG, "Unstarring card: " + loyaltyCard.id);
-                    DBHelper.updateLoyaltyCardStarStatus(mDatabase, loyaltyCard.id, 0);
-                    updateLoyaltyCardList(false);
-                    inputMode.finish();
-                }
-                return true;
-            }
-
-            return false;
-        }
-
-        @Override
-        public void onDestroyActionMode(ActionMode inputMode) {
-            mAdapter.clearSelections();
-            mCurrentActionMode = null;
-        }
-    };
-
-    @Override
-    protected void onCreate(Bundle inputSavedInstanceState) {
-        SplashScreen.installSplashScreen(this);
-        super.onCreate(inputSavedInstanceState);
-
-        // Delete old cache files
-        // These could be temporary images for the cropper, temporary images in LoyaltyCard toBundle/writeParcel/ etc.
-        new Thread(() -> {
-            long twentyFourHoursAgo = System.currentTimeMillis() - (1000 * 60 * 60 * 24);
-
-            File[] tempFiles = getCacheDir().listFiles();
-
-            if (tempFiles == null) {
-                Log.e(TAG, "getCacheDir().listFiles() somehow returned null, this should never happen... Skipping cache cleanup...");
-                return;
-            }
-
-            for (File file : tempFiles) {
-                if (file.lastModified() < twentyFourHoursAgo) {
-                    if (!file.delete()) {
-                        Log.w(TAG, "Failed to delete cache file " + file.getPath());
-                    }
-                };
-            }
-        }).start();
-
-        // We should extract the share intent after we called the super.onCreate as it may need to spawn a dialog window and the app needs to be initialized to not crash
-        extractIntentFields(getIntent());
-
-        binding = MainActivityBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
-        Utils.applyWindowInsets(binding.getRoot());
-        setSupportActionBar(binding.toolbar);
-        groupsTabLayout = binding.groups;
-        contentMainBinding = ContentMainBinding.bind(binding.include.getRoot());
-
-        mDatabase = new DBHelper(this).getWritableDatabase();
-
-        mUpdateLoyaltyCardListRunnable = () -> {
-            updateLoyaltyCardList(false);
-        };
-
-        groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
-            @Override
-            public void onTabSelected(TabLayout.Tab tab) {
-                selectedTab = tab.getPosition();
-                Log.d("onTabSelected", "Tab Position " + tab.getPosition());
-                mGroup = tab.getTag();
-                updateLoyaltyCardList(false);
-                // Store active tab in Shared Preference to restore next app launch
-                SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
-                        getString(R.string.sharedpreference_active_tab),
-                        Context.MODE_PRIVATE);
-                SharedPreferences.Editor activeTabPrefEditor = activeTabPref.edit();
-                activeTabPrefEditor.putInt(getString(R.string.sharedpreference_active_tab), tab.getPosition());
-                activeTabPrefEditor.apply();
-            }
-
-            @Override
-            public void onTabUnselected(TabLayout.Tab tab) {
-
-            }
-
-            @Override
-            public void onTabReselected(TabLayout.Tab tab) {
-
-            }
-        });
-
-        mHelpSection = contentMainBinding.helpSection;
-        mNoMatchingCardsText = contentMainBinding.noMatchingCardsText;
-        mNoGroupCardsText = contentMainBinding.noGroupCardsText;
-        mCardList = contentMainBinding.list;
-
-        mAdapter = new LoyaltyCardCursorAdapter(this, null, this, mUpdateLoyaltyCardListRunnable);
-        mCardList.setAdapter(mAdapter);
-        registerForContextMenu(mCardList);
-
-        mBarcodeScannerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
-            // Exit early if the user cancelled the scan (pressed back/home)
-            if (result.getResultCode() != RESULT_OK) {
-                return;
-            }
-
-            Intent editIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-            editIntent.putExtras(result.getData().getExtras());
-            startActivity(editIntent);
-        });
-
-        mSettingsLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
-            if (result.getResultCode() == Activity.RESULT_OK) {
-                Intent intent = result.getData();
-                if (intent != null && intent.getBooleanExtra(RESTART_ACTIVITY_INTENT, false)) {
-                    recreate();
-                }
-            }
-        });
-
-        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
-            @Override
-            public void handleOnBackPressed() {
-                if (mSearchView != null && !mSearchView.isIconified()) {
-                    mSearchView.setIconified(true);
-                } else {
-                    finish();
-                }
-            }
-        });
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        if (mCurrentActionMode != null) {
-            mAdapter.clearSelections();
-            mCurrentActionMode.finish();
-        }
-
-        if (mSearchView != null && !mSearchView.isIconified()) {
-            mFilter = mSearchView.getQuery().toString();
-        }
-        // Start of active tab logic
-        updateTabGroups(groupsTabLayout);
-
-        // Restore selected tab from Shared Preference
-        SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
-                getString(R.string.sharedpreference_active_tab),
-                Context.MODE_PRIVATE);
-        selectedTab = activeTabPref.getInt(getString(R.string.sharedpreference_active_tab), 0);
-
-        // Restore sort preferences from Shared Preferences
-        mOrder = Utils.getLoyaltyCardOrder(this);
-        mOrderDirection = Utils.getLoyaltyCardOrderDirection(this);
-
-        mGroup = null;
-
-        if (groupsTabLayout.getTabCount() != 0) {
-            TabLayout.Tab tab = groupsTabLayout.getTabAt(selectedTab);
-            if (tab == null) {
-                tab = groupsTabLayout.getTabAt(0);
-            }
-
-            groupsTabLayout.selectTab(tab);
-            assert tab != null;
-            mGroup = tab.getTag();
-        } else {
-            scaleScreen();
-        }
-
-        updateLoyaltyCardList(true);
-        // End of active tab logic
-
-        FloatingActionButton addButton = binding.fabAdd;
-
-        addButton.setOnClickListener(v -> {
-            Intent intent = new Intent(getApplicationContext(), ScanActivity.class);
-            Bundle bundle = new Bundle();
-            if (selectedTab != 0) {
-                bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, groupsTabLayout.getTabAt(selectedTab).getText().toString());
-            }
-            intent.putExtras(bundle);
-            mBarcodeScannerLauncher.launch(intent);
-        });
-        addButton.bringToFront();
-
-        var layoutManager = (GridLayoutManager) mCardList.getLayoutManager();
-        if (layoutManager != null) {
-            var settings = new Settings(this);
-            layoutManager.setSpanCount(settings.getPreferredColumnCount());
-        }
-    }
-
-    private void displayCardSetupOptions(Menu menu, boolean shouldShow) {
-        for (int id : new int[]{R.id.action_search, R.id.action_display_options, R.id.action_sort}) {
-            menu.findItem(id).setVisible(shouldShow);
-        }
-    }
-
-    private void updateLoyaltyCardCount() {
-        mLoyaltyCardCount = DBHelper.getLoyaltyCardCount(mDatabase);
-    }
-
-    private void updateLoyaltyCardList(boolean updateCount) {
-        Group group = null;
-        if (mGroup != null) {
-            group = (Group) mGroup;
-        }
-
-        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection, mAdapter.showingArchivedCards() ? DBHelper.LoyaltyCardArchiveFilter.All : DBHelper.LoyaltyCardArchiveFilter.Unarchived));
-
-        if (updateCount) {
-            updateLoyaltyCardCount();
-            // Update menu icons if necessary
-            invalidateOptionsMenu();
-        }
-
-        if (mLoyaltyCardCount > 0) {
-            // We want the cardList to be visible regardless of the filtered match count
-            // to ensure that the noMatchingCardsText doesn't end up being shown below
-            // the keyboard
-            mHelpSection.setVisibility(View.GONE);
-            mNoGroupCardsText.setVisibility(View.GONE);
-
-            if (mAdapter.getItemCount() > 0) {
-                mCardList.setVisibility(View.VISIBLE);
-                mNoMatchingCardsText.setVisibility(View.GONE);
-            } else {
-                mCardList.setVisibility(View.GONE);
-                if (!mFilter.isEmpty()) {
-                    // Actual Empty Search Result
-                    mNoMatchingCardsText.setVisibility(View.VISIBLE);
-                    mNoGroupCardsText.setVisibility(View.GONE);
-                } else {
-                    // Group Tab with no Group Cards
-                    mNoMatchingCardsText.setVisibility(View.GONE);
-                    mNoGroupCardsText.setVisibility(View.VISIBLE);
-                }
-            }
-        } else {
-            mCardList.setVisibility(View.GONE);
-            mHelpSection.setVisibility(View.VISIBLE);
-
-            mNoMatchingCardsText.setVisibility(View.GONE);
-            mNoGroupCardsText.setVisibility(View.GONE);
-        }
-
-        if (mCurrentActionMode != null) {
-            mCurrentActionMode.finish();
-        }
-
-        new ListWidget().updateAll(mAdapter.mContext);
-    }
-
-    private void processParseResultList(List<ParseResult> parseResultList, String group, boolean closeAppOnNoBarcode) {
-        if (parseResultList.isEmpty()) {
-            throw new IllegalArgumentException("parseResultList may not be empty");
-        }
-
-        Utils.makeUserChooseParseResultFromList(MainActivity.this, parseResultList, new ParseResultListDisambiguatorCallback() {
-            @Override
-            public void onUserChoseParseResult(ParseResult parseResult) {
-                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-                Bundle bundle = parseResult.toLoyaltyCardBundle(MainActivity.this);
-                if (group != null) {
-                    bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, group);
-                }
-                intent.putExtras(bundle);
-                startActivity(intent);
-            }
-
-            @Override
-            public void onUserDismissedSelector() {
-                if (closeAppOnNoBarcode) {
-                    finish();
-                }
-            }
-        });
-    }
-
-    private void onSharedIntent(Intent intent) {
-        String receivedAction = intent.getAction();
-        String receivedType = intent.getType();
-
-        if (receivedAction == null || receivedType == null) {
-            return;
-        }
-
-        List<ParseResult> parseResultList;
-
-        // Check for shared text
-        if (receivedAction.equals(Intent.ACTION_SEND) && receivedType.equals("text/plain")) {
-            LoyaltyCard loyaltyCard = new LoyaltyCard();
-            loyaltyCard.setCardId(intent.getStringExtra(Intent.EXTRA_TEXT));
-            parseResultList = Collections.singletonList(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
-        } else {
-            // Parse whatever file was sent, regardless of opening or sharing
-            Uri data;
-            if (receivedAction.equals(Intent.ACTION_VIEW)) {
-                data = intent.getData();
-            } else if (receivedAction.equals(Intent.ACTION_SEND)) {
-                data = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-            } else {
-                Log.e(TAG, "Wrong action type to parse intent");
-                return;
-            }
-
-            if (receivedType.startsWith("image/")) {
-                parseResultList = Utils.retrieveBarcodesFromImage(this, data);
-            } else if (receivedType.equals("application/pdf")) {
-                parseResultList = Utils.retrieveBarcodesFromPdf(this, data);
-            } else if (Arrays.asList("application/vnd.apple.pkpass", "application/vnd-com.apple.pkpass").contains(receivedType)) {
-                parseResultList = Utils.retrieveBarcodesFromPkPass(this, data);
-            } else if (receivedType.equals("application/vnd.espass-espass")) {
-                // FIXME: espass is not pkpass
-                // However, several users stated in https://github.com/CatimaLoyalty/Android/issues/2197 that the formats are extremely similar to the point they could rename an .espass file to .pkpass and have it imported
-                // So it makes sense to "unofficially" treat it as a PKPASS for now, even though not completely correct
-                parseResultList = Utils.retrieveBarcodesFromPkPass(this, data);
-            } else if (receivedType.equals("application/vnd.apple.pkpasses")) {
-                parseResultList = Utils.retrieveBarcodesFromPkPasses(this, data);
-            } else {
-                Log.e(TAG, "Wrong mime-type");
-                return;
-            }
-        }
-
-        // Give up if we should parse but there is nothing to parse
-        if (parseResultList == null || parseResultList.isEmpty()) {
-            finish();
-            return;
-        }
-
-        processParseResultList(parseResultList, null, true);
-    }
-
-    private void extractIntentFields(Intent intent) {
-        onSharedIntent(intent);
-    }
-
-    public void updateTabGroups(TabLayout groupsTabLayout) {
-        List<Group> newGroups = DBHelper.getGroups(mDatabase);
-
-        if (newGroups.size() == 0) {
-            groupsTabLayout.removeAllTabs();
-            groupsTabLayout.setVisibility(View.GONE);
-            return;
-        }
-
-        groupsTabLayout.removeAllTabs();
-
-        TabLayout.Tab allTab = groupsTabLayout.newTab();
-        allTab.setText(R.string.all);
-        allTab.setTag(null);
-        groupsTabLayout.addTab(allTab, false);
-
-        for (Group group : newGroups) {
-            TabLayout.Tab tab = groupsTabLayout.newTab();
-            tab.setText(group._id);
-            tab.setTag(group);
-            groupsTabLayout.addTab(tab, false);
-        }
-
-        groupsTabLayout.setVisibility(View.VISIBLE);
-
-    }
-
-    @Override
-    // Saving currentQuery to finalQuery for user, this will be used to restore search history, happens when user clicks a card from list
-    protected void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        finalQuery = currentQuery;
-        // Putting the query also into outState for later use in onRestoreInstanceState when rotating screen
-        if (mSearchView != null) {
-            outState.putString(STATE_SEARCH_QUERY, finalQuery);
-        }
-    }
-
-    @Override
-    // Restoring instance state when rotation of screen happens with the goal to restore search query for user
-    protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        finalQuery = savedInstanceState.getString(STATE_SEARCH_QUERY, "");
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu inputMenu) {
-        getMenuInflater().inflate(R.menu.main_menu, inputMenu);
-
-        displayCardSetupOptions(inputMenu, mLoyaltyCardCount > 0);
-
-        SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
-        if (searchManager != null) {
-            MenuItem searchMenuItem = inputMenu.findItem(R.id.action_search);
-            mSearchView = (SearchView) searchMenuItem.getActionView();
-            mSearchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
-            mSearchView.setSubmitButtonEnabled(false);
-            mSearchView.setOnCloseListener(() -> {
-                invalidateOptionsMenu();
-                return false;
-            });
-
-            /*
-             * On Android 13 and later, pressing Back while the search view is open hides the keyboard
-             * and collapses the search view at the same time.
-             * This brings back the old behavior on Android 12 and lower: pressing Back once
-             * hides the keyboard, press again while keyboard is hidden to collapse the search view.
-             */
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                searchMenuItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
-                    @Override
-                    public boolean onMenuItemActionExpand(@NonNull MenuItem item) {
-                        return true;
-                    }
-
-                    @Override
-                    public boolean onMenuItemActionCollapse(@NonNull MenuItem item) {
-                        if (mSearchView.hasFocus()) {
-                            mSearchView.clearFocus();
-                            return false;
-                        }
-                        currentQuery = "";
-                        mFilter = "";
-                        updateLoyaltyCardList(false);
-                        return true;
-                    }
-                });
-            }
-
-            mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-                @Override
-                public boolean onQueryTextSubmit(String query) {
-                    return false;
-                }
-
-                @Override
-                public boolean onQueryTextChange(String newText) {
-                    mFilter = newText;
-                    // New logic to ensure search history after coming back from picked card - user will see the last search query
-                    if (newText.isEmpty()) {
-                        if(!finalQuery.isEmpty()){
-                            // Setting the query text for user after coming back from picked card from finalQuery
-                            mSearchView.setQuery(finalQuery, false);
-                        }
-                        else if(!currentQuery.isEmpty()){
-                            // Else if is needed in case user deletes search - expected behaviour is to show all cards
-                            currentQuery = "";
-                            mSearchView.setQuery(currentQuery, false);
-                        }
-                    } else {
-                        // Setting search query each time user changes the text in search to temporary variable to be used later in finalQuery String which will be used to restore search history
-                        currentQuery = newText;
-                    }
-                    TabLayout.Tab currentTab = groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition());
-                    mGroup = currentTab != null ? currentTab.getTag() : null;
-
-                    updateLoyaltyCardList(false);
-
-                    return true;
-                }
-            });
-            // Check if we came from a picked card back to search, in that case we want to show the search view with previous search query
-            if(!finalQuery.isEmpty()){
-                // Expand the search view to show the query
-                searchMenuItem.expandActionView();
-                // Setting the query text to empty String due to behaviour of onQueryTextChange after coming back from picked card - onQueryTextChange is called automatically without users interaction
-                finalQuery = "";
-                mSearchView.setQuery(currentQuery, false);
-            }
-        }
-
-        return super.onCreateOptionsMenu(inputMenu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem inputItem) {
-        int id = inputItem.getItemId();
-
-        if (id == android.R.id.home) {
-            getOnBackPressedDispatcher().onBackPressed();
-        }
-
-        if (id == R.id.action_display_options) {
-            mAdapter.showDisplayOptionsDialog();
-            invalidateOptionsMenu();
-
-            return true;
-        }
-
-        if (id == R.id.action_sort) {
-            AtomicInteger currentIndex = new AtomicInteger();
-            List<DBHelper.LoyaltyCardOrder> loyaltyCardOrders = Arrays.asList(DBHelper.LoyaltyCardOrder.values());
-            for (int i = 0; i < loyaltyCardOrders.size(); i++) {
-                if (mOrder == loyaltyCardOrders.get(i)) {
-                    currentIndex.set(i);
-                    break;
-                }
-            }
-
-            AlertDialog.Builder builder = new MaterialAlertDialogBuilder(MainActivity.this);
-            builder.setTitle(R.string.sort_by);
-
-            SortingOptionBinding sortingOptionBinding = SortingOptionBinding
-                    .inflate(LayoutInflater.from(MainActivity.this), null, false);
-            final View customLayout = sortingOptionBinding.getRoot();
-            builder.setView(customLayout);
-
-            CheckBox showReversed = sortingOptionBinding.checkBoxReverse;
-
-
-            showReversed.setChecked(mOrderDirection == DBHelper.LoyaltyCardOrderDirection.Descending);
-
-
-            builder.setSingleChoiceItems(R.array.sort_types_array, currentIndex.get(), (dialog, which) -> currentIndex.set(which));
-
-            builder.setPositiveButton(R.string.sort, (dialog, which) -> {
-
-                setSort(
-                        loyaltyCardOrders.get(currentIndex.get()),
-                        showReversed.isChecked() ? DBHelper.LoyaltyCardOrderDirection.Descending : DBHelper.LoyaltyCardOrderDirection.Ascending
-                );
-
-                new ListWidget().updateAll(this);
-
-                dialog.dismiss();
-            });
-
-            builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
-
-            AlertDialog dialog = builder.create();
-            dialog.show();
-
-            return true;
-        }
-
-        if (id == R.id.action_manage_groups) {
-            Intent i = new Intent(getApplicationContext(), ManageGroupsActivity.class);
-            startActivity(i);
-            return true;
-        }
-
-        if (id == R.id.action_import_export) {
-            Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
-            startActivity(i);
-            return true;
-        }
-
-        if (id == R.id.action_settings) {
-            Intent i = new Intent(getApplicationContext(), SettingsActivity.class);
-            mSettingsLauncher.launch(i);
-            return true;
-        }
-
-        if (id == R.id.action_about) {
-            Intent i = new Intent(getApplicationContext(), AboutActivity.class);
-            startActivity(i);
-            return true;
-        }
-
-
-        return super.onOptionsItemSelected(inputItem);
-    }
-
-    private void setSort(DBHelper.LoyaltyCardOrder order, DBHelper.LoyaltyCardOrderDirection direction) {
-        // Update values
-        mOrder = order;
-        mOrderDirection = direction;
-
-        // Store in Shared Preference to restore next app launch
-        SharedPreferences sortPref = getApplicationContext().getSharedPreferences(
-                getString(R.string.sharedpreference_sort),
-                Context.MODE_PRIVATE);
-        SharedPreferences.Editor sortPrefEditor = sortPref.edit();
-        sortPrefEditor.putString(getString(R.string.sharedpreference_sort_order), order.name());
-        sortPrefEditor.putString(getString(R.string.sharedpreference_sort_direction), direction.name());
-        sortPrefEditor.apply();
-
-        // Update card list
-        updateLoyaltyCardList(false);
-    }
-
-    @Override
-    public void onRowLongClicked(int inputPosition) {
-        enableActionMode(inputPosition);
-    }
-
-    private void enableActionMode(int inputPosition) {
-        if (mCurrentActionMode == null) {
-            mCurrentActionMode = startSupportActionMode(mCurrentActionModeCallback);
-        }
-        toggleSelection(inputPosition);
-    }
-
-    private void scaleScreen() {
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
-        int screenHeight = displayMetrics.heightPixels;
-        float mediumSizePx = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,MEDIUM_SCALE_FACTOR_DIP,getResources().getDisplayMetrics());
-        boolean shouldScaleSmaller = screenHeight < mediumSizePx;
-
-        binding.include.welcomeIcon.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
-    }
-
-    private void toggleSelection(int inputPosition) {
-        mAdapter.toggleSelection(inputPosition);
-        int count = mAdapter.getSelectedItemCount();
-
-        if (count == 0) {
-            mCurrentActionMode.finish();
-        } else {
-            mCurrentActionMode.setTitle(getResources().getQuantityString(R.plurals.selectedCardCount, count, count));
-
-            MenuItem editItem = mCurrentActionMode.getMenu().findItem(R.id.action_edit);
-            MenuItem archiveItem = mCurrentActionMode.getMenu().findItem(R.id.action_archive);
-            MenuItem unarchiveItem = mCurrentActionMode.getMenu().findItem(R.id.action_unarchive);
-            MenuItem starItem = mCurrentActionMode.getMenu().findItem(R.id.action_star);
-            MenuItem unstarItem = mCurrentActionMode.getMenu().findItem(R.id.action_unstar);
-
-            boolean hasStarred = false;
-            boolean hasUnstarred = false;
-            boolean hasArchived = false;
-            boolean hasUnarchived = false;
-
-            for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-                if (loyaltyCard.starStatus == 1) {
-                    hasStarred = true;
-                } else {
-                    hasUnstarred = true;
-                }
-
-                if (loyaltyCard.archiveStatus == 1) {
-                    hasArchived = true;
-                } else {
-                    hasUnarchived = true;
-                }
-
-                // We have all types, no need to keep checking
-                if (hasStarred && hasUnstarred && hasArchived && hasUnarchived) {
-                    break;
-                }
-            }
-
-            unarchiveItem.setVisible(hasArchived);
-            archiveItem.setVisible(hasUnarchived);
-
-            if (count == 1) {
-                starItem.setVisible(!hasStarred);
-                unstarItem.setVisible(!hasUnstarred);
-                editItem.setVisible(true);
-                editItem.setEnabled(true);
-            } else {
-                starItem.setVisible(hasUnstarred);
-                unstarItem.setVisible(hasStarred);
-
-                editItem.setVisible(false);
-                editItem.setEnabled(false);
-            }
-
-            mCurrentActionMode.invalidate();
-        }
-    }
-
-
-    @Override
-    public void onRowClicked(int inputPosition) {
-        if (mAdapter.getSelectedItemCount() > 0) {
-            enableActionMode(inputPosition);
-        } else {
-            // FIXME
-            //
-            // There is a really nasty edge case that can happen when someone taps a card but right
-            // after it swipes (very small window, hard to reproduce). The cursor gets replaced and
-            // may not have a card at the ID number that is returned from onRowClicked.
-            //
-            // The proper fix, obviously, would involve makes sure an onFling can't happen while a
-            // click is being processed. Sadly, I have not yet found a way to make that possible.
-            LoyaltyCard loyaltyCard;
-            try {
-                loyaltyCard = mAdapter.getCard(inputPosition);
-            } catch (CursorIndexOutOfBoundsException e) {
-                Log.w(TAG, "Prevented crash from tap + swipe on ID " + inputPosition + ": " + e);
-                return;
-            }
-
-            Intent intent = new Intent(this, LoyaltyCardViewActivity.class);
-            intent.setAction("");
-            final Bundle b = new Bundle();
-            b.putInt(LoyaltyCardViewActivity.BUNDLE_ID, loyaltyCard.id);
-
-            ArrayList<Integer> cardList = new ArrayList<>();
-            for (int i = 0; i < mAdapter.getItemCount(); i++) {
-                cardList.add(mAdapter.getCard(i).id);
-            }
-
-            b.putIntegerArrayList(LoyaltyCardViewActivity.BUNDLE_CARDLIST, cardList);
-            intent.putExtras(b);
-
-            startActivity(intent);
-        }
-    }
-}
@@ -0,0 +1,945 @@
+package protect.card_locker
+
+import android.app.SearchManager
+import android.content.DialogInterface
+import android.content.Intent
+import android.database.CursorIndexOutOfBoundsException
+import android.database.sqlite.SQLiteDatabase
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.util.DisplayMetrics
+import android.util.Log
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultCallback
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
+import androidx.appcompat.view.ActionMode
+import androidx.appcompat.widget.SearchView
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.recyclerview.widget.GridLayoutManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.tabs.TabLayout
+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
+import protect.card_locker.preferences.Settings
+import protect.card_locker.preferences.SettingsActivity
+import java.io.UnsupportedEncodingException
+import java.util.concurrent.atomic.AtomicInteger
+import androidx.core.content.edit
+
+class MainActivity : CatimaAppCompatActivity(), CardAdapterListener {
+    private lateinit var binding: MainActivityBinding
+    private lateinit var contentMainBinding: ContentMainBinding
+    private lateinit var mDatabase: SQLiteDatabase
+    private lateinit var mAdapter: LoyaltyCardCursorAdapter
+    private var mCurrentActionMode: ActionMode? = null
+    private var mSearchView: SearchView? = null
+    private var mLoyaltyCardCount = 0
+    @JvmField
+    var mFilter: String = ""
+    private var currentQuery = ""
+    private var finalQuery = ""
+    private var mGroup: Any? = null
+    private var mOrder: LoyaltyCardOrder = LoyaltyCardOrder.Alpha
+    private var mOrderDirection: LoyaltyCardOrderDirection = LoyaltyCardOrderDirection.Ascending
+    private var selectedTab: Int = 0
+    private lateinit var groupsTabLayout: TabLayout
+    private lateinit var mUpdateLoyaltyCardListRunnable: Runnable
+    private lateinit var mBarcodeScannerLauncher: ActivityResultLauncher<Intent>
+    private lateinit var mSettingsLauncher: ActivityResultLauncher<Intent>
+
+    private val mCurrentActionModeCallback: ActionMode.Callback = object : ActionMode.Callback {
+        override fun onCreateActionMode(inputMode: ActionMode, inputMenu: Menu?): Boolean {
+            inputMode.menuInflater.inflate(R.menu.card_longclick_menu, inputMenu)
+            return true
+        }
+
+        override fun onPrepareActionMode(inputMode: ActionMode?, inputMenu: Menu?): Boolean {
+            return false
+        }
+
+        override fun onActionItemClicked(inputMode: ActionMode, inputItem: MenuItem): Boolean {
+            when (inputItem.itemId) {
+                R.id.action_share -> {
+                    try {
+                        ImportURIHelper(this@MainActivity).startShareIntent(mAdapter.getSelectedItems())
+                    } catch (e: UnsupportedEncodingException) {
+                        Toast.makeText(
+                            this@MainActivity,
+                            R.string.failedGeneratingShareURL,
+                            Toast.LENGTH_LONG
+                        ).show()
+                        e.printStackTrace()
+                    }
+                    inputMode.finish()
+                    return true
+                }
+                R.id.action_edit -> {
+                    require(mAdapter.selectedItemCount == 1) { "Cannot edit more than 1 card at a time" }
+
+                    startActivity(
+                        Intent(applicationContext, LoyaltyCardEditActivity::class.java).apply {
+                            putExtras(Bundle().apply {
+                                putInt(
+                                    LoyaltyCardEditActivity.BUNDLE_ID,
+                                    mAdapter.getSelectedItems()[0].id
+                                )
+                                putBoolean(LoyaltyCardEditActivity.BUNDLE_UPDATE, true)
+                            })
+                        }
+                    )
+
+                    inputMode.finish()
+                    return true
+                }
+                R.id.action_duplicate -> {
+                    require(mAdapter.selectedItemCount == 1) { "Cannot duplicate more than 1 card at a time" }
+
+                    startActivity(
+                        Intent(applicationContext, LoyaltyCardEditActivity::class.java).apply {
+                            putExtras(Bundle().apply {
+                                putInt(
+                                    LoyaltyCardEditActivity.BUNDLE_ID,
+                                    mAdapter.getSelectedItems()[0].id
+                                )
+                                putBoolean(LoyaltyCardEditActivity.BUNDLE_DUPLICATE_ID, true)
+                            })
+                        }
+                    )
+
+                    inputMode.finish()
+                    return true
+                }
+                R.id.action_delete -> {
+                    MaterialAlertDialogBuilder(this@MainActivity).apply {
+                        // The following may seem weird, but it is necessary to give translators enough flexibility.
+                        // For example, in Russian, Android's plural quantity "one" actually refers to "any number ending on 1 but not ending in 11".
+                        // So while in English the extra non-plural form seems unnecessary duplication, it is necessary to give translators enough flexibility.
+                        // In here, we use the plain string when meaning exactly 1, and otherwise use the plural forms
+                        if (mAdapter.selectedItemCount == 1) {
+                            setTitle(R.string.deleteTitle)
+                            setMessage(R.string.deleteConfirmation)
+                        } else {
+                            setTitle(
+                                getResources().getQuantityString(
+                                    R.plurals.deleteCardsTitle,
+                                    mAdapter.selectedItemCount,
+                                    mAdapter.selectedItemCount
+                                )
+                            )
+                            setMessage(
+                                getResources().getQuantityString(
+                                    R.plurals.deleteCardsConfirmation,
+                                    mAdapter.selectedItemCount,
+                                    mAdapter.selectedItemCount
+                                )
+                            )
+                        }
+
+                        setPositiveButton(
+                            R.string.confirm
+                        ) { dialog, _ ->
+                            for (loyaltyCard in mAdapter.getSelectedItems()) {
+                                Log.d(TAG, "Deleting card: " + loyaltyCard.id)
+
+                                DBHelper.deleteLoyaltyCard(mDatabase, this@MainActivity, loyaltyCard.id)
+                            }
+                            val tab = groupsTabLayout.getTabAt(selectedTab)
+                            mGroup = tab?.tag
+
+                            updateLoyaltyCardList(true)
+                            dialog.dismiss()
+                        }
+
+                        setNegativeButton(R.string.cancel) { dialog, _ ->
+                            dialog.dismiss()
+                        }
+                    }.create().show()
+
+                    return true
+                }
+                R.id.action_archive -> {
+                    for (loyaltyCard in mAdapter.getSelectedItems()) {
+                        Log.d(TAG, "Archiving card: " + loyaltyCard.id)
+                        DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id, 1)
+                        updateLoyaltyCardList(false)
+                        inputMode.finish()
+                        invalidateOptionsMenu()
+                    }
+                    return true
+                }
+                R.id.action_unarchive -> {
+                    for (loyaltyCard in mAdapter.getSelectedItems()) {
+                        Log.d(TAG, "Unarchiving card: " + loyaltyCard.id)
+                        DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id, 0)
+                        updateLoyaltyCardList(false)
+                        inputMode.finish()
+                        invalidateOptionsMenu()
+                    }
+                    return true
+                }
+                R.id.action_star -> {
+                    for (loyaltyCard in mAdapter.getSelectedItems()) {
+                        Log.d(TAG, "Starring card: " + loyaltyCard.id)
+                        DBHelper.updateLoyaltyCardStarStatus(mDatabase, loyaltyCard.id, 1)
+                        updateLoyaltyCardList(false)
+                        inputMode.finish()
+                    }
+                    return true
+                }
+                R.id.action_unstar -> {
+                    for (loyaltyCard in mAdapter.getSelectedItems()) {
+                        Log.d(TAG, "Unstarring card: " + loyaltyCard.id)
+                        DBHelper.updateLoyaltyCardStarStatus(mDatabase, loyaltyCard.id, 0)
+                        updateLoyaltyCardList(false)
+                        inputMode.finish()
+                    }
+                    return true
+                }
+            }
+
+            return false
+        }
+
+        override fun onDestroyActionMode(inputMode: ActionMode?) {
+            mAdapter.clearSelections()
+            mCurrentActionMode = null
+        }
+    }
+
+    override fun onCreate(inputSavedInstanceState: Bundle?) {
+        installSplashScreen()
+        super.onCreate(inputSavedInstanceState)
+
+        // Delete old cache files
+        // These could be temporary images for the cropper, temporary images in LoyaltyCard toBundle/writeParcel/ etc.
+        Thread {
+            val twentyFourHoursAgo = System.currentTimeMillis() - (1000 * 60 * 60 * 24)
+            val tempFiles = cacheDir.listFiles()
+
+            if (tempFiles == null) {
+                Log.e(
+                    TAG,
+                    "getCacheDir().listFiles() somehow returned null, this should never happen... Skipping cache cleanup..."
+                )
+                return@Thread
+            }
+            for (file in tempFiles) {
+                if (file.lastModified() < twentyFourHoursAgo) {
+                    if (!file.delete()) {
+                        Log.w(TAG, "Failed to delete cache file " + file.path)
+                    }
+                }
+            }
+        }.start()
+
+        // We should extract the share intent after we called the super.onCreate as it may need to spawn a dialog window and the app needs to be initialized to not crash
+        extractIntentFields(intent)
+
+        binding = MainActivityBinding.inflate(layoutInflater)
+        setContentView(binding.getRoot())
+        Utils.applyWindowInsets(binding.getRoot())
+        setSupportActionBar(binding.toolbar)
+        groupsTabLayout = binding.groups
+        contentMainBinding = ContentMainBinding.bind(binding.include.getRoot())
+
+        mDatabase = DBHelper(this).writableDatabase
+
+        mUpdateLoyaltyCardListRunnable = Runnable {
+            updateLoyaltyCardList(false)
+        }
+
+        groupsTabLayout.addOnTabSelectedListener(object : OnTabSelectedListener {
+            override fun onTabSelected(tab: TabLayout.Tab) {
+                selectedTab = tab.position
+                Log.d("onTabSelected", "Tab Position " + tab.position)
+                mGroup = tab.tag
+                updateLoyaltyCardList(false)
+                // Store active tab in Shared Preference to restore next app launch
+                applicationContext.getSharedPreferences(
+                    getString(R.string.sharedpreference_active_tab),
+                    MODE_PRIVATE
+                ).edit {
+                    putInt(
+                        getString(R.string.sharedpreference_active_tab),
+                        tab.position
+                    )
+                }
+            }
+
+            override fun onTabUnselected(tab: TabLayout.Tab?) {
+            }
+
+            override fun onTabReselected(tab: TabLayout.Tab?) {
+            }
+        })
+
+        mAdapter = LoyaltyCardCursorAdapter(this, null, this, mUpdateLoyaltyCardListRunnable)
+        contentMainBinding.list.setAdapter(mAdapter)
+        registerForContextMenu(contentMainBinding.list)
+
+        mBarcodeScannerLauncher = registerForActivityResult(
+            StartActivityForResult(),
+            ActivityResultCallback registerForActivityResult@{ result: ActivityResult? ->
+                // Exit early if the user cancelled the scan (pressed back/home)
+                if (result == null || result.resultCode != RESULT_OK) {
+                    return@registerForActivityResult
+                }
+
+                startActivity(
+                    Intent(applicationContext, LoyaltyCardEditActivity::class.java).apply {
+                        putExtras(result.data!!.extras!!)
+                    }
+                )
+            })
+
+        mSettingsLauncher = registerForActivityResult(
+            StartActivityForResult()
+        ) { result: ActivityResult? ->
+            if (result?.resultCode == RESULT_OK) {
+                val intent = result.data
+                if (intent != null && intent.getBooleanExtra(RESTART_ACTIVITY_INTENT, false)) {
+                    recreate()
+                }
+            }
+        }
+
+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                if (mSearchView != null && !mSearchView!!.isIconified) {
+                    mSearchView!!.isIconified = true
+                } else {
+                    finish()
+                }
+            }
+        })
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        if (mCurrentActionMode != null) {
+            mAdapter.clearSelections()
+            mCurrentActionMode!!.finish()
+        }
+
+        if (mSearchView != null && !mSearchView!!.isIconified) {
+            mFilter = mSearchView!!.query.toString()
+        }
+        // Start of active tab logic
+        updateTabGroups(groupsTabLayout)
+
+        // Restore selected tab from Shared Preference
+        selectedTab = applicationContext.getSharedPreferences(
+            getString(R.string.sharedpreference_active_tab),
+            MODE_PRIVATE
+        ).getInt(getString(R.string.sharedpreference_active_tab), 0)
+
+        // Restore sort preferences from Shared Preferences
+        mOrder = Utils.getLoyaltyCardOrder(this)
+        mOrderDirection = Utils.getLoyaltyCardOrderDirection(this)
+
+        mGroup = null
+
+        if (groupsTabLayout.tabCount != 0) {
+            var tab = groupsTabLayout.getTabAt(selectedTab)
+            if (tab == null) {
+                tab = groupsTabLayout.getTabAt(0)
+            }
+
+            groupsTabLayout.selectTab(tab)
+            checkNotNull(tab)
+            mGroup = tab.tag
+        } else {
+            scaleScreen()
+        }
+
+        updateLoyaltyCardList(true)
+
+        // End of active tab logic
+
+        binding.fabAdd.setOnClickListener {
+            mBarcodeScannerLauncher.launch(
+                Intent(applicationContext, ScanActivity::class.java).apply {
+                    putExtras(Bundle().apply {
+                        if (selectedTab != 0) {
+                            putString(
+                                LoyaltyCardEditActivity.BUNDLE_ADDGROUP,
+                                groupsTabLayout.getTabAt(selectedTab)!!.text.toString()
+                            )
+                        }
+                    })
+                }
+            )
+        }
+        binding.fabAdd.bringToFront()
+
+        // Apply column count setting to card list
+        val layoutManager = contentMainBinding.list.layoutManager as GridLayoutManager?
+        if (layoutManager != null) {
+            val settings = Settings(this)
+            layoutManager.setSpanCount(settings.getPreferredColumnCount())
+        }
+    }
+
+    private fun displayCardSetupOptions(menu: Menu, shouldShow: Boolean) {
+        for (id in intArrayOf(R.id.action_search, R.id.action_display_options, R.id.action_sort)) {
+            menu.findItem(id).isVisible = shouldShow
+        }
+    }
+
+    private fun updateLoyaltyCardCount() {
+        mLoyaltyCardCount = DBHelper.getLoyaltyCardCount(mDatabase)
+    }
+
+    private fun updateLoyaltyCardList(updateCount: Boolean) {
+        var group: Group? = null
+        if (mGroup != null) {
+            group = mGroup as Group
+        }
+
+        mAdapter.swapCursor(
+            DBHelper.getLoyaltyCardCursor(
+                mDatabase,
+                mFilter,
+                group,
+                mOrder,
+                mOrderDirection,
+                if (mAdapter.showingArchivedCards()) DBHelper.LoyaltyCardArchiveFilter.All else DBHelper.LoyaltyCardArchiveFilter.Unarchived
+            )
+        )
+
+        if (updateCount) {
+            updateLoyaltyCardCount()
+            // Update menu icons if necessary
+            invalidateOptionsMenu()
+        }
+
+        if (mLoyaltyCardCount > 0) {
+            // We want the cardList to be visible regardless of the filtered match count
+            // to ensure that the noMatchingCardsText doesn't end up being shown below
+            // the keyboard
+            contentMainBinding.helpSection.visibility = View.GONE
+            contentMainBinding.noGroupCardsText.visibility = View.GONE
+
+            if (mAdapter.itemCount > 0) {
+                contentMainBinding.list.visibility = View.VISIBLE
+                contentMainBinding.noMatchingCardsText.visibility = View.GONE
+            } else {
+                contentMainBinding.list.visibility = View.GONE
+                if (!mFilter.isEmpty()) {
+                    // Actual Empty Search Result
+                    contentMainBinding.noMatchingCardsText.visibility = View.VISIBLE
+                    contentMainBinding.noGroupCardsText.visibility = View.GONE
+                } else {
+                    // Group Tab with no Group Cards
+                    contentMainBinding.noMatchingCardsText.visibility = View.GONE
+                    contentMainBinding.noGroupCardsText.visibility = View.VISIBLE
+                }
+            }
+        } else {
+            contentMainBinding.list.visibility = View.GONE
+            contentMainBinding.helpSection.visibility = View.VISIBLE
+
+            contentMainBinding.noMatchingCardsText.visibility = View.GONE
+            contentMainBinding.noGroupCardsText.visibility = View.GONE
+        }
+
+        if (mCurrentActionMode != null) {
+            mCurrentActionMode!!.finish()
+        }
+
+        ListWidget().updateAll(mAdapter.mContext)
+        ShortcutHelper.updateShortcuts(mAdapter.mContext)
+    }
+
+    private fun processParseResultList(
+        parseResultList: MutableList<ParseResult?>,
+        group: String?,
+        closeAppOnNoBarcode: Boolean
+    ) {
+        require(!parseResultList.isEmpty()) { "parseResultList may not be empty" }
+
+        Utils.makeUserChooseParseResultFromList(
+            this@MainActivity,
+            parseResultList,
+            object : ParseResultListDisambiguatorCallback {
+                override fun onUserChoseParseResult(parseResult: ParseResult) {
+                    val intent =
+                        Intent(applicationContext, LoyaltyCardEditActivity::class.java)
+                    val bundle = parseResult.toLoyaltyCardBundle(this@MainActivity)
+                    if (group != null) {
+                        bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, group)
+                    }
+                    intent.putExtras(bundle)
+                    startActivity(intent)
+                }
+
+                override fun onUserDismissedSelector() {
+                    if (closeAppOnNoBarcode) {
+                        finish()
+                    }
+                }
+            })
+    }
+
+    private fun onSharedIntent(intent: Intent) {
+        val receivedAction = intent.action
+        val receivedType = intent.type
+
+        if (receivedAction == null || receivedType == null) {
+            return
+        }
+
+        val parseResultList: MutableList<ParseResult?>?
+
+        // Check for shared text
+        if (receivedAction == Intent.ACTION_SEND && receivedType == "text/plain") {
+            val loyaltyCard = LoyaltyCard()
+            loyaltyCard.setCardId(intent.getStringExtra(Intent.EXTRA_TEXT)!!)
+            parseResultList = mutableListOf(ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard))
+        } else {
+            // Parse whatever file was sent, regardless of opening or sharing
+            val data: Uri? = when (receivedAction) {
+                Intent.ACTION_VIEW -> {
+                    intent.data
+                }
+                Intent.ACTION_SEND -> {
+                    intent.getParcelableExtra(Intent.EXTRA_STREAM)
+                }
+                else -> {
+                    Log.e(TAG, "Wrong action type to parse intent")
+                    return
+                }
+            }
+
+            if (receivedType.startsWith("image/")) {
+                parseResultList = Utils.retrieveBarcodesFromImage(this, data)
+            } else if (receivedType == "application/pdf") {
+                parseResultList = Utils.retrieveBarcodesFromPdf(this, data)
+            } else if (mutableListOf<String?>(
+                    "application/vnd.apple.pkpass",
+                    "application/vnd-com.apple.pkpass"
+                ).contains(receivedType)
+            ) {
+                parseResultList = Utils.retrieveBarcodesFromPkPass(this, data)
+            } else if (receivedType == "application/vnd.espass-espass") {
+                // FIXME: espass is not pkpass
+                // However, several users stated in https://github.com/CatimaLoyalty/Android/issues/2197 that the formats are extremely similar to the point they could rename an .espass file to .pkpass and have it imported
+                // So it makes sense to "unofficially" treat it as a PKPASS for now, even though not completely correct
+                parseResultList = Utils.retrieveBarcodesFromPkPass(this, data)
+            } else if (receivedType == "application/vnd.apple.pkpasses") {
+                parseResultList = Utils.retrieveBarcodesFromPkPasses(this, data)
+            } else {
+                Log.e(TAG, "Wrong mime-type")
+                return
+            }
+        }
+
+        // Give up if we should parse but there is nothing to parse
+        if (parseResultList == null || parseResultList.isEmpty()) {
+            finish()
+            return
+        }
+
+        processParseResultList(parseResultList, null, true)
+    }
+
+    private fun extractIntentFields(intent: Intent) {
+        onSharedIntent(intent)
+    }
+
+    fun updateTabGroups(groupsTabLayout: TabLayout) {
+        val newGroups = DBHelper.getGroups(mDatabase)
+
+        if (newGroups.isEmpty()) {
+            groupsTabLayout.removeAllTabs()
+            groupsTabLayout.visibility = View.GONE
+            return
+        }
+
+        groupsTabLayout.removeAllTabs()
+        groupsTabLayout.addTab(
+            groupsTabLayout.newTab().apply {
+                setText(R.string.all)
+                tag = null
+            },
+            false
+        )
+
+        for (group in newGroups) {
+            groupsTabLayout.addTab(
+                groupsTabLayout.newTab().apply {
+                    text = group._id
+                    tag = group
+                },
+                false
+            )
+        }
+
+        groupsTabLayout.visibility = View.VISIBLE
+    }
+
+    // Saving currentQuery to finalQuery for user, this will be used to restore search history, happens when user clicks a card from list
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        finalQuery = currentQuery
+        // Putting the query also into outState for later use in onRestoreInstanceState when rotating screen
+        if (mSearchView != null) {
+            outState.putString(STATE_SEARCH_QUERY, finalQuery)
+        }
+    }
+
+    // Restoring instance state when rotation of screen happens with the goal to restore search query for user
+    override fun onRestoreInstanceState(savedInstanceState: Bundle) {
+        super.onRestoreInstanceState(savedInstanceState)
+        finalQuery = savedInstanceState.getString(STATE_SEARCH_QUERY, "")
+    }
+
+    override fun onCreateOptionsMenu(inputMenu: Menu): Boolean {
+        menuInflater.inflate(R.menu.main_menu, inputMenu)
+
+        displayCardSetupOptions(inputMenu, mLoyaltyCardCount > 0)
+
+        val searchManager = getSystemService(SEARCH_SERVICE) as SearchManager?
+        if (searchManager != null) {
+            val searchMenuItem = inputMenu.findItem(R.id.action_search)
+            mSearchView = searchMenuItem.actionView as SearchView?
+            mSearchView!!.setSearchableInfo(searchManager.getSearchableInfo(componentName))
+            mSearchView!!.setSubmitButtonEnabled(false)
+            mSearchView!!.setOnCloseListener {
+                invalidateOptionsMenu()
+                false
+            }
+
+            /*
+             * On Android 13 and later, pressing Back while the search view is open hides the keyboard
+             * and collapses the search view at the same time.
+             * This brings back the old behavior on Android 12 and lower: pressing Back once
+             * hides the keyboard, press again while keyboard is hidden to collapse the search view.
+             */
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                searchMenuItem.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
+                    override fun onMenuItemActionExpand(item: MenuItem): Boolean {
+                        return true
+                    }
+
+                    override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
+                        if (mSearchView!!.hasFocus()) {
+                            mSearchView!!.clearFocus()
+                            return false
+                        }
+                        currentQuery = ""
+                        mFilter = ""
+                        updateLoyaltyCardList(false)
+                        return true
+                    }
+                })
+            }
+
+            mSearchView!!.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+                override fun onQueryTextSubmit(query: String?): Boolean {
+                    return false
+                }
+
+                override fun onQueryTextChange(newText: String): Boolean {
+                    mFilter = newText
+                    // New logic to ensure search history after coming back from picked card - user will see the last search query
+                    if (newText.isEmpty()) {
+                        if (!finalQuery.isEmpty()) {
+                            // Setting the query text for user after coming back from picked card from finalQuery
+                            mSearchView!!.setQuery(finalQuery, false)
+                        } else if (!currentQuery.isEmpty()) {
+                            // Else if is needed in case user deletes search - expected behaviour is to show all cards
+                            currentQuery = ""
+                            mSearchView!!.setQuery(currentQuery, false)
+                        }
+                    } else {
+                        // Setting search query each time user changes the text in search to temporary variable to be used later in finalQuery String which will be used to restore search history
+                        currentQuery = newText
+                    }
+                    val currentTab =
+                        groupsTabLayout.getTabAt(groupsTabLayout.selectedTabPosition)
+                    mGroup = currentTab?.tag
+
+                    updateLoyaltyCardList(false)
+
+                    return true
+                }
+            })
+            // Check if we came from a picked card back to search, in that case we want to show the search view with previous search query
+            if (!finalQuery.isEmpty()) {
+                // Expand the search view to show the query
+                searchMenuItem.expandActionView()
+                // Setting the query text to empty String due to behaviour of onQueryTextChange after coming back from picked card - onQueryTextChange is called automatically without users interaction
+                finalQuery = ""
+                mSearchView!!.setQuery(currentQuery, false)
+            }
+        }
+
+        return super.onCreateOptionsMenu(inputMenu)
+    }
+
+    override fun onOptionsItemSelected(inputItem: MenuItem): Boolean {
+        when (inputItem.itemId) {
+            android.R.id.home -> {
+                onBackPressedDispatcher.onBackPressed()
+            }
+            R.id.action_display_options -> {
+                mAdapter.showDisplayOptionsDialog()
+                invalidateOptionsMenu()
+                return true
+            }
+            R.id.action_sort -> {
+                val currentIndex = AtomicInteger()
+                val loyaltyCardOrders = listOf<LoyaltyCardOrder?>(*LoyaltyCardOrder.entries.toTypedArray())
+                for (i in loyaltyCardOrders.indices) {
+                    if (mOrder == loyaltyCardOrders[i]) {
+                        currentIndex.set(i)
+                        break
+                    }
+                }
+
+                MaterialAlertDialogBuilder(this@MainActivity).apply {
+                    setTitle(R.string.sort_by)
+
+                    val sortingOptionBinding = SortingOptionBinding.inflate(LayoutInflater.from(this@MainActivity), null, false)
+                    val customLayout: View = sortingOptionBinding.getRoot()
+                    setView(customLayout)
+
+                    val showReversed = sortingOptionBinding.checkBoxReverse
+
+                    showReversed.isChecked = mOrderDirection == LoyaltyCardOrderDirection.Descending
+
+                    setSingleChoiceItems(
+                        R.array.sort_types_array,
+                        currentIndex.get()
+                    ) { _: DialogInterface?, which: Int ->
+                        currentIndex.set(which)
+                    }
+
+                    setPositiveButton(
+                        R.string.sort
+                    ) { dialog, _ ->
+                        setSort(
+                            loyaltyCardOrders[currentIndex.get()]!!,
+                            if (showReversed.isChecked) LoyaltyCardOrderDirection.Descending else LoyaltyCardOrderDirection.Ascending
+                        )
+                        ListWidget().updateAll(this@MainActivity)
+                        dialog?.dismiss()
+                    }
+
+                    setNegativeButton(R.string.cancel) { dialog, _ ->
+                        dialog.dismiss()
+                    }
+                }.create().show()
+
+                return true
+            }
+            R.id.action_manage_groups -> {
+                startActivity(
+                    Intent(applicationContext, ManageGroupsActivity::class.java)
+                )
+                return true
+            }
+            R.id.action_import_export -> {
+                startActivity(
+                    Intent(applicationContext, ImportExportActivity::class.java)
+                )
+                return true
+            }
+            R.id.action_settings -> {
+                mSettingsLauncher.launch(
+                    Intent(applicationContext, SettingsActivity::class.java)
+                )
+                return true
+            }
+            R.id.action_about -> {
+                startActivity(
+                    Intent(applicationContext, AboutActivity::class.java)
+                )
+                return true
+            }
+        }
+
+        return super.onOptionsItemSelected(inputItem)
+    }
+
+    private fun setSort(order: LoyaltyCardOrder, direction: LoyaltyCardOrderDirection) {
+        // Update values
+        mOrder = order
+        mOrderDirection = direction
+
+        // Store in Shared Preference to restore next app launch
+        applicationContext.getSharedPreferences(
+            getString(R.string.sharedpreference_sort),
+            MODE_PRIVATE
+        ).edit {
+            putString(
+                getString(R.string.sharedpreference_sort_order),
+                order.name
+            )
+            putString(
+                getString(R.string.sharedpreference_sort_direction),
+                direction.name
+            )
+        }
+
+        // Update card list
+        updateLoyaltyCardList(false)
+    }
+
+    override fun onRowLongClicked(inputPosition: Int) {
+        enableActionMode(inputPosition)
+    }
+
+    private fun enableActionMode(inputPosition: Int) {
+        if (mCurrentActionMode == null) {
+            mCurrentActionMode = startSupportActionMode(mCurrentActionModeCallback)
+        }
+        toggleSelection(inputPosition)
+    }
+
+    private fun scaleScreen() {
+        val displayMetrics = DisplayMetrics()
+        windowManager.defaultDisplay.getMetrics(displayMetrics)
+        val screenHeight = displayMetrics.heightPixels
+        val mediumSizePx = TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP,
+            MEDIUM_SCALE_FACTOR_DIP.toFloat(),
+            getResources().displayMetrics
+        )
+        val shouldScaleSmaller = screenHeight < mediumSizePx
+
+        binding.include.welcomeIcon.visibility = if (shouldScaleSmaller) View.GONE else View.VISIBLE
+    }
+
+    private fun toggleSelection(inputPosition: Int) {
+        mAdapter.toggleSelection(inputPosition)
+        val count = mAdapter.selectedItemCount
+
+        if (count == 0) {
+            mCurrentActionMode!!.finish()
+        } else {
+            mCurrentActionMode!!.title = getResources().getQuantityString(
+                R.plurals.selectedCardCount,
+                count,
+                count
+            )
+
+            val editItem = mCurrentActionMode!!.menu.findItem(R.id.action_edit)
+            val duplicateItem = mCurrentActionMode!!.menu.findItem(R.id.action_duplicate)
+            val archiveItem = mCurrentActionMode!!.menu.findItem(R.id.action_archive)
+            val unarchiveItem = mCurrentActionMode!!.menu.findItem(R.id.action_unarchive)
+            val starItem = mCurrentActionMode!!.menu.findItem(R.id.action_star)
+            val unstarItem = mCurrentActionMode!!.menu.findItem(R.id.action_unstar)
+
+            var hasStarred = false
+            var hasUnstarred = false
+            var hasArchived = false
+            var hasUnarchived = false
+
+            for (loyaltyCard in mAdapter.getSelectedItems()) {
+                if (loyaltyCard.starStatus == 1) {
+                    hasStarred = true
+                } else {
+                    hasUnstarred = true
+                }
+
+                if (loyaltyCard.archiveStatus == 1) {
+                    hasArchived = true
+                } else {
+                    hasUnarchived = true
+                }
+
+                // We have all types, no need to keep checking
+                if (hasStarred && hasUnstarred && hasArchived && hasUnarchived) {
+                    break
+                }
+            }
+
+            unarchiveItem.isVisible = hasArchived
+            archiveItem.isVisible = hasUnarchived
+
+            if (count == 1) {
+                starItem.isVisible = !hasStarred
+                unstarItem.isVisible = !hasUnstarred
+                editItem.isVisible = true
+                editItem.isEnabled = true
+                duplicateItem.isVisible = true
+                duplicateItem.isEnabled = true
+            } else {
+                starItem.isVisible = hasUnstarred
+                unstarItem.isVisible = hasStarred
+
+                editItem.isVisible = false
+                editItem.isEnabled = false
+                duplicateItem.isVisible = false
+                duplicateItem.isEnabled = false
+            }
+
+            mCurrentActionMode!!.invalidate()
+        }
+    }
+
+
+    override fun onRowClicked(inputPosition: Int) {
+        if (mAdapter.selectedItemCount > 0) {
+            enableActionMode(inputPosition)
+        } else {
+            // FIXME
+            //
+            // There is a really nasty edge case that can happen when someone taps a card but right
+            // after it swipes (very small window, hard to reproduce). The cursor gets replaced and
+            // may not have a card at the ID number that is returned from onRowClicked.
+            //
+            // The proper fix, obviously, would involve makes sure an onFling can't happen while a
+            // click is being processed. Sadly, I have not yet found a way to make that possible.
+            val loyaltyCard: LoyaltyCard
+            try {
+                loyaltyCard = mAdapter.getCard(inputPosition)
+            } catch (e: CursorIndexOutOfBoundsException) {
+                Log.w(TAG, "Prevented crash from tap + swipe on ID $inputPosition: $e")
+                return
+            }
+
+            startActivity(
+                Intent(this, LoyaltyCardViewActivity::class.java).apply {
+                    action = ""
+                    putExtras(Bundle().apply {
+                        putInt(LoyaltyCardViewActivity.BUNDLE_ID, loyaltyCard.id)
+
+                        val cardList = ArrayList<Int?>()
+                        for (i in 0..<mAdapter.itemCount) {
+                            cardList.add(mAdapter.getCard(i).id)
+                        }
+
+                        putIntegerArrayList(LoyaltyCardViewActivity.BUNDLE_CARDLIST, cardList)
+                    })
+                }
+            )
+        }
+    }
+
+    companion object {
+        private const val TAG = "Catima"
+        const val RESTART_ACTIVITY_INTENT: String = "restart_activity_intent"
+
+        private const val MEDIUM_SCALE_FACTOR_DIP = 460
+        const val STATE_SEARCH_QUERY: String = "SEARCH_QUERY"
+    }
+}
@@ -12,10 +12,12 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.core.widget.doAfterTextChanged
+import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import protect.card_locker.LoyaltyCardCursorAdapter.CardAdapterListener
 import protect.card_locker.databinding.ActivityManageGroupBinding
+import protect.card_locker.preferences.Settings

 class ManageGroupActivity : CatimaAppCompatActivity(), CardAdapterListener {
    private lateinit var binding: ActivityManageGroupBinding
@@ -132,7 +134,15 @@ class ManageGroupActivity : CatimaAppCompatActivity(), CardAdapterListener {
                override fun handleOnBackPressed() {
                    leaveWithoutSaving()
                }
-            })
+            }
+        )
+
+        // Apply column count setting to card list
+        val layoutManager = mCardList.layoutManager as GridLayoutManager?
+        if (layoutManager != null) {
+            val settings = Settings(this)
+            layoutManager.setSpanCount(settings.getPreferredColumnCount())
+        }
    }

    private fun adapterStateToBundle(adapterState: HashMap<Int, Boolean>): Bundle {
@@ -1,18 +1,17 @@
 package protect.card_locker;

+import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.net.Uri;
 import android.util.Log;
 import android.widget.Toast;

-import androidx.appcompat.app.AppCompatActivity;
-
 public class OpenWebLinkHandler {

    private static final String TAG = "Catima";

-    public void openBrowser(AppCompatActivity activity, String url) {
+    public void openBrowser(Activity activity, String url) {
        if (url == null) {
            return;
        }
@@ -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);
        }
    }
 }
@@ -14,6 +14,8 @@ import org.json.JSONObject
 import java.io.FileNotFoundException
 import java.io.IOException
 import java.math.BigDecimal
+import java.nio.charset.Charset
+import java.nio.charset.StandardCharsets
 import java.text.DateFormat
 import java.text.ParseException
 import java.time.ZonedDateTime
@@ -40,6 +42,7 @@ class PkpassParser(context: Context, uri: Uri?) {
    private var cardId: String = context.getString(R.string.noBarcode)
    private var barcodeId: String? = null
    private var barcodeType: CatimaBarcode? = null
+    private var barcodeEncoding: Charset = StandardCharsets.ISO_8859_1
    private var headerColor: Int? = null
    private val starStatus = 0
    private val lastUsed: Long = 0
@@ -134,6 +137,7 @@ class PkpassParser(context: Context, uri: Uri?) {
            cardId,
            barcodeId,
            barcodeType,
+            barcodeEncoding,
            headerColor,
            starStatus,
            lastUsed,
@@ -342,7 +346,6 @@ class PkpassParser(context: Context, uri: Uri?) {
            else -> throw IllegalArgumentException("No valid barcode type")
        }

-        // FIXME: We probably need to do something with the messageEncoding field
        try {
            cardId = barcodeInfo.getString("altText")
            barcodeId = barcodeInfo.getString("message")
@@ -351,6 +354,12 @@ class PkpassParser(context: Context, uri: Uri?) {
            barcodeId = null
        }

+        try {
+            barcodeEncoding = Charset.forName(barcodeInfo.getString("messageEncoding"))
+        } catch (ignored: Exception) {
+            // If encoding is not defined, null or otherwise invalid, stick to the default
+        }
+
        // Don't set barcodeId if it's the same as cardId
        if (cardId == barcodeId) {
            barcodeId = null
@@ -538,19 +538,11 @@ class ScanActivity : CatimaAppCompatActivity() {

    override fun onRequestPermissionsResult(
        requestCode: Int,
-        permissions: Array<String?>,
+        permissions: Array<String>,
        grantResults: IntArray
    ) {
        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

@@ -2,31 +2,35 @@ package protect.card_locker;

 import android.content.Context;
 import android.content.Intent;
+import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.os.Bundle;

+import androidx.annotation.VisibleForTesting;
 import androidx.core.content.pm.ShortcutInfoCompat;
 import androidx.core.content.pm.ShortcutManagerCompat;
-import androidx.core.graphics.ColorUtils;
 import androidx.core.graphics.drawable.IconCompat;

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

-class ShortcutHelper {
-    // Android documentation says that no more than 5 shortcuts
-    // are supported. However, that may be too many, as not all
-    // launcher will show all 5. Instead, the number is limited
-    // to 3 here, so that the most recent shortcut has a good
-    // chance of being shown.
-    private static final int MAX_SHORTCUTS = 3;
+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
+     * manually modified. We use -1 here as a default value to check if
+     * the value has been set either manually by the test scenario or
+     * automatically in the `updateShortcuts` function.
+     * Its actual value will be set based on the maximum amount of shortcuts
+     * declared by the launcher via `getMaxShortcutCountPerActivity`.
+     */
+    @VisibleForTesting
+    public static int maxShortcuts = -1;

    // https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable.html
    private static final int ADAPTIVE_BITMAP_SCALE = 1;
@@ -35,86 +39,45 @@ class ShortcutHelper {
    private static final int ADAPTIVE_BITMAP_IMAGE_SIZE = ADAPTIVE_BITMAP_VISIBLE_SIZE + 5 * ADAPTIVE_BITMAP_SCALE;

    /**
-     * Add a card to the app shortcuts, and maintain a list of the most
-     * recently used cards. If there is already a shortcut for the card,
-     * the card is marked as the most recently used card. If adding this
-     * card exceeds the max number of shortcuts, then the least recently
-     * used card shortcut is discarded.
+     * Update the dynamic shortcut list with the most recently viewed cards
+     * 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, LoyaltyCard card) {
-        if (card.archiveStatus == 1) {
-            // Don't add archived card to menu
-            return;
+    public static void updateShortcuts(Context context) {
+        if (maxShortcuts == -1) {
+            maxShortcuts = ShortcutManagerCompat.getMaxShortcutCountPerActivity(context);
        }
-
-        LinkedList<ShortcutInfoCompat> list = new LinkedList<>(ShortcutManagerCompat.getDynamicShortcuts(context));
-
-        SQLiteDatabase database = new DBHelper(context).getReadableDatabase();
-
-        String shortcutId = Integer.toString(card.id);
-
-        // Sort the shortcuts by rank, so working with the relative order will be easier.
-        // This sorts so that the lowest rank is first.
-        Collections.sort(list, Comparator.comparingInt(ShortcutInfoCompat::getRank));
-
-        Integer foundIndex = null;
-
-        for (int index = 0; index < list.size(); index++) {
-            if (list.get(index).getId().equals(shortcutId)) {
-                // Found the item already
-                foundIndex = index;
-                break;
-            }
-        }
-
-        if (foundIndex != null) {
-            // If the item is already found, then the list needs to be
-            // reordered, so that the selected item now has the lowest
-            // rank, thus letting it survive longer.
-            ShortcutInfoCompat found = list.remove(foundIndex.intValue());
-            list.addFirst(found);
-        } else {
-            // The item is new to the list. We add it and trim the list later.
-            ShortcutInfoCompat shortcut = createShortcutBuilder(context, card).build();
-            list.addFirst(shortcut);
-        }
-
        LinkedList<ShortcutInfoCompat> finalList = new LinkedList<>();
-        int rank = 0;
+        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;

-        // The ranks are now updated; the order in the list is the rank.
-        for (int index = 0; index < list.size(); index++) {
-            ShortcutInfoCompat prevShortcut = list.get(index);
+            while (rank < maxShortcuts && loyaltyCardCursor.moveToNext()) {
+                int id = loyaltyCardCursor.getInt(loyaltyCardCursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
+                LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(context, database, id);

-            LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(context, database, Integer.parseInt(prevShortcut.getId()));
-
-            // skip outdated cards that no longer exist
-            if (loyaltyCard != null) {
                ShortcutInfoCompat updatedShortcut = createShortcutBuilder(context, loyaltyCard)
                        .setRank(rank)
                        .build();

                finalList.addLast(updatedShortcut);
                rank++;
-
-                // trim the list
-                if (rank >= MAX_SHORTCUTS) {
-                    break;
-                }
            }
+        } finally {
+            dbHelper.close();
        }

        ShortcutManagerCompat.setDynamicShortcuts(context, finalList);
    }

-    /**
-     * Remove the given card id from the app shortcuts, if such a
-     * shortcut exists.
-     */
-    static void removeShortcut(Context context, int cardId) {
-        ShortcutManagerCompat.removeDynamicShortcuts(context, Collections.singletonList(Integer.toString(cardId)));
-    }
-
    static @NotNull
    Bitmap createAdaptiveBitmap(@NotNull Bitmap in, int paddingColor) {
        Bitmap ret = Bitmap.createBitmap(ADAPTIVE_BITMAP_SIZE, ADAPTIVE_BITMAP_SIZE, Bitmap.Config.ARGB_8888);
@@ -130,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);
@@ -150,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) {
@@ -118,7 +118,7 @@ public class Utils {
    static final double LUMINANCE_MIDPOINT = 0.5;

    static final int BITMAP_SIZE_SMALL = 512;
-    static final int BITMAP_SIZE_BIG = 2048;
+    static final int BITMAP_SIZE_BIG = 1600;

    static public LetterBitmap generateIcon(Context context, LoyaltyCard loyaltyCard, boolean forShortcut) {
        return generateIcon(context, loyaltyCard.store, loyaltyCard.headerColor, forShortcut);
@@ -143,7 +143,7 @@ public class Utils {
        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterImageSize);

        if (backgroundColor == null) {
-            backgroundColor = LetterBitmap.getDefaultColor(context, store);
+            backgroundColor = LetterBitmap.Companion.getDefaultColor(context, store);
        }

        return new LetterBitmap(context, store, store,
@@ -963,31 +963,9 @@ public class Utils {
    // replace colors in the current theme
    public static void patchColors(AppCompatActivity activity) {
        Settings settings = new Settings(activity);
-        String color = settings.getColor();

        Resources.Theme theme = activity.getTheme();
-        Resources resources = activity.getResources();
-        if (color.equals(resources.getString(R.string.settings_key_pink_theme))) {
-            theme.applyStyle(R.style.pink, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_magenta_theme))) {
-            theme.applyStyle(R.style.magenta, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_violet_theme))) {
-            theme.applyStyle(R.style.violet, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_blue_theme))) {
-            theme.applyStyle(R.style.blue, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_sky_blue_theme))) {
-            theme.applyStyle(R.style.skyblue, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_green_theme))) {
-            theme.applyStyle(R.style.green, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_brown_theme))) {
-            theme.applyStyle(R.style.brown, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_catima_theme))) {
-            // catima theme is AppTheme itself, no dynamic colors nor applyStyle
-        } else {
-            // final catch all in case of invalid theme value from older versions
-            // also handles R.string.settings_key_system_theme
-            DynamicColors.applyToActivityIfAvailable(activity);
-        }
+        DynamicColors.applyToActivityIfAvailable(activity);

        if (isDarkModeEnabled(activity) && settings.getOledDark()) {
            theme.applyStyle(R.style.DarkBackground, true);
@@ -1129,7 +1107,7 @@ public class Utils {
    }

    public static int getHeaderColor(Context context, LoyaltyCard loyaltyCard) {
-        return loyaltyCard.headerColor != null ? loyaltyCard.headerColor : LetterBitmap.getDefaultColor(context, loyaltyCard.store);
+        return loyaltyCard.headerColor != null ? loyaltyCard.headerColor : LetterBitmap.Companion.getDefaultColor(context, loyaltyCard.store);
    }

    public static String checksum(InputStream input) throws IOException {
@@ -0,0 +1,199 @@
+package protect.card_locker.cardimageview
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import android.os.Bundle
+import android.view.WindowManager
+import android.widget.Toast
+import androidx.activity.OnBackPressedDispatcher
+import androidx.activity.compose.setContent
+import androidx.annotation.StringRes
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.gestures.rememberTransformableState
+import androidx.compose.foundation.gestures.transformable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.IntSize
+import protect.card_locker.CatimaComponentActivity
+import protect.card_locker.ImageLocationType
+import protect.card_locker.R
+import protect.card_locker.Utils
+import protect.card_locker.compose.CatimaTopAppBar
+import protect.card_locker.compose.theme.CatimaTheme
+import protect.card_locker.preferences.Settings
+
+class LoyaltyCardImageViewActivity : CatimaComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        fixedEdgeToEdge()
+        applyWindowPreferences()
+
+        val imageLocationType = intent.imageLocationType()
+        val loyaltyCardId = intent.getIntExtra(BUNDLE_ID, 0)
+        val bitmap = imageLocationType?.let {
+            Utils.retrieveCardImage(this, loyaltyCardId, it)
+        }
+
+        if (loyaltyCardId == 0 || imageLocationType == null || bitmap == null) {
+            Toast.makeText(this, R.string.failedToRetrieveImageFile, Toast.LENGTH_SHORT).show()
+            finish()
+            return
+        }
+
+        title = getString(imageLocationType.descriptionRes())
+
+        setContent {
+            CatimaTheme {
+                LoyaltyCardImageViewScreen(
+                    bitmap = bitmap,
+                    contentDescriptionRes = imageLocationType.descriptionRes(),
+                    onBackPressedDispatcher = onBackPressedDispatcher
+                )
+            }
+        }
+    }
+
+    private fun applyWindowPreferences() {
+        val settings = Settings(this)
+        val currentWindow = window ?: return
+
+        val attributes = currentWindow.attributes
+        if (settings.useMaxBrightnessDisplayingBarcode()) {
+            attributes.screenBrightness = 1F
+        }
+
+        if (settings.keepScreenOn) {
+            currentWindow.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        }
+
+        currentWindow.attributes = attributes
+    }
+
+    private fun Intent.imageLocationType(): ImageLocationType? {
+        val name = getStringExtra(BUNDLE_IMAGE_LOCATION_TYPE) ?: return null
+        return runCatching { ImageLocationType.valueOf(name) }.getOrNull()
+    }
+
+    private fun ImageLocationType.descriptionRes(): Int {
+        return when (this) {
+            ImageLocationType.icon -> R.string.thumbnailDescription
+            ImageLocationType.front -> R.string.frontImageDescription
+            ImageLocationType.back -> R.string.backImageDescription
+        }
+    }
+
+    companion object {
+        const val BUNDLE_ID = "id"
+        const val BUNDLE_IMAGE_LOCATION_TYPE = "imageLocationType"
+
+        @JvmStatic
+        fun createIntent(
+            context: Context,
+            loyaltyCardId: Int,
+            imageLocationType: ImageLocationType
+        ): Intent {
+            return Intent(context, LoyaltyCardImageViewActivity::class.java)
+                .putExtra(BUNDLE_ID, loyaltyCardId)
+                .putExtra(BUNDLE_IMAGE_LOCATION_TYPE, imageLocationType.name)
+        }
+    }
+}
+
+@Composable
+fun LoyaltyCardImageViewScreen(
+    bitmap: Bitmap,
+    @StringRes contentDescriptionRes: Int,
+    onBackPressedDispatcher: OnBackPressedDispatcher,
+) {
+    var scale by remember { mutableFloatStateOf(1F) }
+    var offset by remember { mutableStateOf(Offset.Zero) }
+    var size by remember { mutableStateOf(IntSize.Zero) }
+    val zoomState = rememberTransformableState { _, zoomChange, panChange, _ ->
+        val nextScale = (scale * zoomChange).coerceIn(1F, MAX_IMAGE_SCALE)
+        scale = nextScale
+        offset = if (nextScale == 1F) {
+            Offset.Zero
+        } else {
+            (offset + panChange).clampTo(size, nextScale)
+        }
+    }
+
+    Scaffold(
+        topBar = {
+            CatimaTopAppBar(
+                title = stringResource(contentDescriptionRes),
+                onBackPressedDispatcher = onBackPressedDispatcher
+            )
+        }
+    ) { innerPadding ->
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(innerPadding)
+                .background(MaterialTheme.colorScheme.background)
+                .testTag("card_image_zoom")
+        ) {
+            Image(
+                bitmap = bitmap.asImageBitmap(),
+                contentDescription = stringResource(contentDescriptionRes),
+                contentScale = ContentScale.Fit,
+                modifier = Modifier
+                    .fillMaxSize()
+                    .onSizeChanged { size = it }
+                    .pointerInput(bitmap) {
+                        detectTapGestures(
+                            onDoubleTap = {
+                                scale = 1F
+                                offset = Offset.Zero
+                            }
+                        )
+                    }
+                    .transformable(zoomState)
+                    .graphicsLayer {
+                        scaleX = scale
+                        scaleY = scale
+                        translationX = offset.x
+                        translationY = offset.y
+                    }
+                    .testTag("card_image")
+            )
+        }
+    }
+}
+
+private fun Offset.clampTo(size: IntSize, scale: Float): Offset {
+    if (size.width == 0 || size.height == 0) {
+        return this
+    }
+
+    val maxX = size.width * (scale - 1F) / 2F
+    val maxY = size.height * (scale - 1F) / 2F
+    return Offset(
+        x = x.coerceIn(-maxX, maxX),
+        y = y.coerceIn(-maxY, maxY)
+    )
+}
+
+private const val MAX_IMAGE_SCALE = 5F
@@ -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));
+        }
+    }
+}
@@ -0,0 +1,100 @@
+package protect.card_locker.compose
+
+import androidx.activity.compose.LocalActivity
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.unit.dp
+import protect.card_locker.OpenWebLinkHandler
+import protect.card_locker.R
+
+@Composable
+fun CatimaAboutSection(
+    title: String,
+    message: String,
+    modifier: Modifier = Modifier,
+    onClickUrl: String? = null,
+    onClickDialogText: AnnotatedString? = null,
+) {
+    val activity = LocalActivity.current
+
+    val openDialog = remember { mutableStateOf(false) }
+
+    Row(
+        modifier = modifier
+            .padding(horizontal = 16.dp, vertical = 8.dp)
+            .clickable {
+                if (onClickDialogText != null) {
+                    openDialog.value = true
+                } else if (onClickUrl != null) {
+                    OpenWebLinkHandler().openBrowser(activity, onClickUrl)
+                }
+            }
+            .semantics(mergeDescendants = true) {}
+    ) {
+        Column(modifier = Modifier.weight(1F)) {
+            Text(
+                text = title,
+                style = MaterialTheme.typography.titleMedium
+            )
+            Text(text = message)
+        }
+        Text(modifier = Modifier.align(Alignment.CenterVertically).semantics() { hideFromAccessibility() },
+            text = ">",
+            style = MaterialTheme.typography.bodyMedium
+        )
+    }
+    if (openDialog.value && onClickDialogText != null) {
+        AlertDialog(
+            icon = {},
+            title = {
+                Text(text = title)
+            },
+            text = {
+                Text(
+                    text = onClickDialogText,
+                    modifier = Modifier.verticalScroll(rememberScrollState())
+                )
+            },
+            onDismissRequest = {
+                openDialog.value = false
+            },
+            confirmButton = {
+                TextButton(
+                    onClick = {
+                        openDialog.value = false
+                    }
+                ) {
+                    Text(stringResource(R.string.ok))
+                }
+            },
+            dismissButton = {
+                if (onClickUrl != null) {
+                    TextButton(
+                        onClick = {
+                            OpenWebLinkHandler().openBrowser(activity, onClickUrl)
+                        }
+                    ) {
+                        Text(stringResource(R.string.view_online))
+                    }
+                }
+            }
+        )
+    }
+}
@@ -0,0 +1,56 @@
+package protect.card_locker.compose
+
+import androidx.activity.OnBackPressedDispatcher
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.stringResource
+import protect.card_locker.R
+import protect.card_locker.preferences.Settings
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun CatimaTopAppBar(title: String, onBackPressedDispatcher: OnBackPressedDispatcher?) {
+    // Use pure black in OLED theme
+    val context = LocalContext.current
+    val settings = Settings(context)
+    val isDarkMode = when (settings.theme) {
+        AppCompatDelegate.MODE_NIGHT_NO -> false
+        AppCompatDelegate.MODE_NIGHT_YES -> true
+        else -> isSystemInDarkTheme()
+    }
+
+    val appBarColors = if (isDarkMode && settings.oledDark) {
+        TopAppBarDefaults.topAppBarColors().copy(containerColor = Color.Black)
+    } else {
+        TopAppBarDefaults.topAppBarColors()
+    }
+
+    TopAppBar(
+        modifier = Modifier.testTag("topbar_catima"),
+        title = { Text(text = title) },
+        colors = appBarColors,
+        navigationIcon = {
+            if (onBackPressedDispatcher != null) {
+                IconButton(onClick = { onBackPressedDispatcher.onBackPressed() }) {
+                    Icon(
+                        imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                        contentDescription = stringResource(R.string.back)
+                    )
+                }
+            }
+        }
+    )
+}
@@ -0,0 +1,51 @@
+package protect.card_locker.compose.theme
+
+import android.os.Build
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.colorResource
+import protect.card_locker.R
+import protect.card_locker.preferences.Settings
+
+@Composable
+fun CatimaTheme(content: @Composable () -> Unit) {
+    val context = LocalContext.current
+    val settings = Settings(context)
+
+    val isDynamicColorSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+
+    val lightTheme = if (isDynamicColorSupported) {
+        dynamicLightColorScheme(context)
+    } else {
+        lightColorScheme(primary = colorResource(id = R.color.md_theme_light_primary))
+    }
+
+    var darkTheme = if (isDynamicColorSupported) {
+        dynamicDarkColorScheme(context)
+    } else {
+        darkColorScheme(primary = colorResource(id = R.color.md_theme_dark_primary))
+    }
+
+    if (settings.oledDark) {
+        darkTheme = darkTheme.copy(background = Color.Black)
+    }
+
+    val colorScheme = when (settings.theme) {
+        AppCompatDelegate.MODE_NIGHT_NO -> lightTheme
+        AppCompatDelegate.MODE_NIGHT_YES -> darkTheme
+        else -> if (isSystemInDarkTheme()) darkTheme else lightTheme
+    }
+
+    MaterialTheme(
+        colorScheme = colorScheme,
+        content = content
+    )
+}
@@ -32,7 +32,7 @@ public class CardsContentProvider extends ContentProvider {
        public static final String MAJOR_COLUMN = "major";
        public static final String MINOR_COLUMN = "minor";
        public static final int MAJOR = 1;
-        public static final int MINOR = 0;
+        public static final int MINOR = 1;
    }

    private static final int URI_VERSION = 0;
@@ -52,6 +52,7 @@ public class CardsContentProvider extends ContentProvider {
            LoyaltyCardDbIds.CARD_ID,
            LoyaltyCardDbIds.BARCODE_ID,
            LoyaltyCardDbIds.BARCODE_TYPE,
+            LoyaltyCardDbIds.BARCODE_ENCODING,
            LoyaltyCardDbIds.STAR_STATUS,
            LoyaltyCardDbIds.LAST_USED,
            LoyaltyCardDbIds.ARCHIVE_STATUS,
@@ -76,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");
@@ -134,6 +134,7 @@ public class CatimaExporter implements Exporter {
                DBHelper.LoyaltyCardDbIds.CARD_ID,
                DBHelper.LoyaltyCardDbIds.BARCODE_ID,
                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
+                DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING,
                DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
                DBHelper.LoyaltyCardDbIds.STAR_STATUS,
                DBHelper.LoyaltyCardDbIds.LAST_USED,
@@ -154,6 +155,7 @@ public class CatimaExporter implements Exporter {
                    card.cardId,
                    card.barcodeId,
                    card.barcodeType != null ? card.barcodeType.name() : "",
+                    card.barcodeEncoding.name(),
                    card.headerColor,
                    card.starStatus,
                    card.lastUsed,
@@ -20,6 +20,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.math.BigDecimal;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Currency;
@@ -127,10 +128,10 @@ public class CatimaImporter implements Importer {
            LoyaltyCard existing = DBHelper.getLoyaltyCard(context, database, card.id);
            if (existing == null) {
                DBHelper.insertLoyaltyCard(database, card.id, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                        card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+                        card.cardId, card.barcodeId, card.barcodeType, card.barcodeEncoding, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
            } else if (!isDuplicate(context, existing, card, existingImages, imageChecksums)) {
                long newId = DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                        card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+                        card.cardId, card.barcodeId, card.barcodeType, card.barcodeEncoding, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
                idMap.put(card.id, (int) newId);
            }
        }
@@ -458,6 +459,15 @@ public class CatimaImporter implements Importer {
            barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
        }

+        // Barcode encoding information is only supported since Catima 2.41.0, so old exports will lack this field
+        // Database migration 19 forcing ISO-8859-1 on all cards, so we should treat imports from old Catima versions the same and force ISO-8859-1 there too
+        // This limits the risk of breaking cards when importing an old database backup
+        Charset barcodeEncoding = StandardCharsets.ISO_8859_1;
+        String unparsedBarcodeEncoding = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING, record, "");
+        if (!unparsedBarcodeEncoding.isEmpty()) {
+            barcodeEncoding = Charset.forName(unparsedBarcodeEncoding);
+        }
+
        Integer headerColor = null;
        try {
            headerColor = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record);
@@ -501,6 +511,7 @@ public class CatimaImporter implements Importer {
                cardId,
                barcodeId,
                barcodeType,
+                barcodeEncoding,
                headerColor,
                starStatus,
                lastUsed,
@@ -160,6 +160,7 @@ public class FidmeImporter implements Importer {
                cardId,
                null,
                barcodeType,
+                StandardCharsets.ISO_8859_1,
                headerColor,
                starStatus,
                Utils.getUnixTime(),
@@ -181,7 +182,7 @@ public class FidmeImporter implements Importer {
        for (LoyaltyCard card : data.cards) {
            // Do not use card.id which is set to -1
            DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                    card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+                    card.cardId, card.barcodeId, card.barcodeType, card.barcodeEncoding, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
        }
    }
 }
@@ -162,6 +162,7 @@ public class VoucherVaultImporter implements Importer {
                    cardId,
                    null,
                    barcodeType,
+                    StandardCharsets.ISO_8859_1,
                    headerColor,
                    0,
                    Utils.getUnixTime(),
@@ -186,7 +187,7 @@ public class VoucherVaultImporter implements Importer {
        for (LoyaltyCard card : data.cards) {
            // Do not use card.id which is set to -1
            DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                    card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+                    card.cardId, card.barcodeId, card.barcodeType, card.barcodeEncoding, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
        }
    }
 }
@@ -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);
    }
@@ -90,10 +94,6 @@ public class Settings {
        return getBoolean(R.string.settings_key_oled_dark, false);
    }

-    public String getColor() {
-        return getString(R.string.setting_key_theme_color, mContext.getResources().getString(R.string.settings_key_system_theme));
-    }
-
    public int getPreferredColumnCount() {
        var defaultSymbol = mContext.getResources().getString(R.string.settings_key_automatic_column_count);
        var defaultColumnCount = mContext.getResources().getInteger(R.integer.main_view_card_columns);
@@ -11,7 +11,6 @@ import androidx.core.os.LocaleListCompat
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import com.google.android.material.color.DynamicColors
 import protect.card_locker.BuildConfig
 import protect.card_locker.CatimaAppCompatActivity
 import protect.card_locker.MainActivity
@@ -103,16 +102,6 @@ class SettingsActivity : CatimaAppCompatActivity() {
                true
            }

-            val themeColorPreference = findPreference<ListPreference>(getString(R.string.setting_key_theme_color))
-            themeColorPreference!!.setOnPreferenceChangeListener { _, _ ->
-                refreshActivity(true)
-                true
-            }
-            if (!DynamicColors.isDynamicColorAvailable()) {
-                themeColorPreference.setEntryValues(R.array.color_values_no_dynamic)
-                themeColorPreference.setEntries(R.array.color_value_strings_no_dynamic)
-            }
-
            val oledDarkPreference = findPreference<Preference>(getString(R.string.settings_key_oled_dark))
            oledDarkPreference!!.setOnPreferenceChangeListener { _, _ ->
                refreshActivity(true)
@@ -168,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
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M2,6h2v12L2,18L2,6zM5,6h1v12L5,18L5,6zM7,6h3v12L7,18L7,6zM11,6h1v12h-1L11,6zM13,6h2v12h-2L13,6zM16,6h2v12h-2L16,6zM19,6h1v12h-1L19,6zM21,6h1v12h-1L21,6z"/>
+</vector>
@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:context="protect.card_locker.MainActivity">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            style="?attr/toolbarStyle" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="?attr/actionBarSize"
-        android:paddingVertical="8dp"
-        android:clipToPadding="false">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/version_history"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/version_history_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/version_history"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/version_history_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:textSize="16sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/version_history_main" />
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/credits"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/credits_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/credits"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/credits_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:textSize="16sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/credits_main" />
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/translate"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/translate_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/help_translate_this_app"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/translate_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/translate_platform"
-                    android:textSize="16sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/translate_main"/>
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/license"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/license_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/license"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/license_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/app_license"
-                    android:textSize="16sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/license_main"/>
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/repo"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/repo_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/source_repository"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/repo_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/on_github"
-                    android:textSize="16sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/repo_main" />
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/privacy"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/privacy_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/privacy_policy"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/privacy_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/and_data_usage"
-                    android:textSize="16sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/privacy_main" />
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/donate"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/donate_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/donate"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/rate"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/rate_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/rate_this_app"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/rate_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/on_google_play"
-                    android:textSize="16sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/rate_main" />
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/report_error"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/report_error_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/report_error"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/report_error_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintTop_toBottomOf="@id/report_error_main"
-                    app:layout_constraintStart_toStartOf="parent"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:textSize="16sp"
-                    android:text="@string/on_github" />
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
@@ -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>
@@ -191,6 +192,32 @@
                    </com.google.android.material.textfield.TextInputLayout>
                </LinearLayout>

+                <!-- Barcode encoding -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="@dimen/inputPadding"
+                    android:paddingTop="@dimen/inputPadding"
+                    android:orientation="horizontal">
+
+                    <!-- Barcode type -->
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/barcodeEncodingView"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.0"
+                        android:hint="@string/barcodeEncoding"
+                        android:labelFor="@+id/barcodeEncodingField">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/barcodeEncodingField"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="none"/>
+                    </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
+
                <!-- Barcode -->
                <LinearLayout android:orientation="horizontal"
                    android:layout_marginTop="10.0dp"
@@ -276,6 +303,24 @@
                    android:paddingTop="@dimen/inputPadding"
                    android:orientation="horizontal">

+                    <!-- Currency -->
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/balanceCurrencyView"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.0"
+                        android:hint="@string/currency"
+                        android:labelFor="@+id/balanceCurrencyField">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/balanceCurrencyField"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="none"/>
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
                    <!-- Balance -->
                    <com.google.android.material.textfield.TextInputLayout
                        android:id="@+id/balanceView"
@@ -294,24 +339,6 @@
                            android:digits="0123456789,." />

                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <!-- Currency -->
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/balanceCurrencyView"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1.0"
-                        android:hint="@string/currency"
-                        android:labelFor="@+id/balanceCurrencyField">
-
-                        <AutoCompleteTextView
-                            android:id="@+id/balanceCurrencyField"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="none"/>
-
-                    </com.google.android.material.textfield.TextInputLayout>
                </LinearLayout>

                <!-- Valid from -->
@@ -158,10 +158,31 @@
            android:visibility="gone"
            tools:visibility="visible"
            app:layout_constraintTop_toBottomOf="@+id/note"
-            app:layout_constraintBottom_toTopOf="@+id/balance"
+            app:layout_constraintBottom_toTopOf="@+id/cardId"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"/>

+        <TextView
+            android:id="@+id/cardId"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="4dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            app:drawableLeftCompat="@drawable/ic_card_id_24dp"
+            android:drawablePadding="4dp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@+id/info_divider"
+            app:layout_constraintBottom_toTopOf="@+id/balance"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:visibility="visible"
+            tools:text="1234567890"/>
+
        <TextView
            android:id="@+id/balance"
            android:layout_width="match_parent"
@@ -174,7 +195,7 @@
            app:drawableLeftCompat="@drawable/ic_baseline_payments_24"
            android:drawablePadding="4dp"
            android:visibility="gone"
-            app:layout_constraintTop_toBottomOf="@+id/info_divider"
+            app:layout_constraintTop_toBottomOf="@+id/cardId"
            app:layout_constraintBottom_toTopOf="@+id/validFrom"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@@ -40,10 +40,16 @@
        android:titleCondensed="@string/unarchive"
        app:showAsAction="never"/>

+    <item
+        android:id="@+id/action_duplicate"
+        android:title="@string/duplicateCard"
+        android:titleCondensed="@string/duplicateCard"
+        app:showAsAction="never" />
+
    <item
        android:id="@+id/action_delete"
        android:icon="@drawable/ic_delete_white_24dp"
        android:title="@string/delete"
        android:titleCondensed="@string/delete"
        app:showAsAction="never"/>
-</menu>
+</menu>
@@ -21,25 +21,25 @@
        app:showAsAction="always">

        <menu>
+            <item
+                android:id="@+id/action_archive"
+                android:title="@string/archive"
+                app:showAsAction="never"/>
+
+            <item
+                android:id="@+id/action_unarchive"
+                android:title="@string/unarchive"
+                app:showAsAction="never"/>

            <item
                android:id="@+id/action_duplicate"
                android:title="@string/duplicateCard"
                app:showAsAction="never" />

-            <item
-                android:id="@+id/action_archive"
-                android:title="@string/archive"
-                app:showAsAction="never"/>
-            <item
-                android:id="@+id/action_unarchive"
-                android:title="@string/unarchive"
-                app:showAsAction="never"/>
            <item
                android:id="@+id/action_delete"
                android:title="@string/delete"
                app:showAsAction="never"/>
-
        </menu>

    </item>
@@ -6,93 +6,101 @@ Allan Nordhøy
 Heimen Stoffels
 Oğuz Ersen
 FC (Fay) Stegerman
+大王叫我来巡山
+B o d o
 StoyanDimitrov
 SlavekB
-大王叫我来巡山
-Katharine Chui
-B o d o
+Katharine Chui / Katie
+Silvério Santos
 mondstern
 IllusiveMan196
-Altonss
-Silvério Santos
-Edgars Andersons
-Michael Moroni
-Joel A
-Eric
-Priit Jõerüüt
 Максим Горпиніч
+Edgars Andersons
 Liner Seven
-GM
-Petr Novák
-laralem
-GitSpoon
+Altonss
 Fjuro
+Joel A
+GitSpoon
+Michael Moroni
+Priit Jõerüüt
+Eric
+GM
+laralem
+Petr Novák
 Taco
+Milo Ivir
 nadiafekihahmed
 pfaffenrodt
+Vasilis
 Aayush Gupta
 Scrambled777
 josé m
 ikanakova
 Nyatsuki
 Giovanni Donisi
-Milo Ivir
-HudobniVolk
-Jiri Grönroos
-Vasilis
-Warder
 Kachelkaiser
-Samantaz Fox
-Горпиніч Максим Олександрович
+Jiri Grönroos
+HudobniVolk
+109247019824
+Warder
 Balázs Meskó
-Feike Donia
-Arno-github
-Ankit Tiwari
+Traductor
+Samantaz Fox
+mdvhimself
+AMIR-G98
 Cliff Heraldo
 Sergio Paredes
+Ankit Tiwari
+Feike
+Arno-github
 Jose Delvani
-109247019824
-mdvhimself
 Milan Šalka
+damjang
 Robin
 தமிழ்நேரம்
 huuhaa
 Skrripy
 Govindgopalyadav
-damjang
-Projjal Moitra
-Quentin PAGÈS
-StellarSand
-aradxxx
-ngocanhtve
-Marnick L'Eau
+Gideon
 waffshappen
-e-michalak
+Marnick L'Eau
 JungHee Lee
+pacavarn
+ngocanhtve
+aradxxx
+StellarSand
+Quentin PAGÈS
+Projjal Moitra
+Aliaksandr Trush
+e-michalak
+தமிழ் நேரம்
 hajertabbane
 Denis Shilin
 Renko
 Ricky Tigg
 Robin Liu
 Ziad OUALHADJ
-delvani
+inavleb
 しいたけ
 Alexander Ivanov
 Miha Frangež
 stavpup
 mrestivill
+ezn24
 ehrt74
 Virginie
 Tim Trek
-Peter Dave Hello
-Aliaksandr Trush
-MisterCosta96
+Thu-Trang Pham
+Alì Mortacci
+Andre Costa
 arshbeerSingh
 Augustin LAVILLE
 Freddo espresso
-Gideon
-n3m0-blip
-Kim Seohyun
-rudy3
-Michael Gangolf
+Peter Dave Hello
 PRATHAMESH BHAGAT 
+Michael Gangolf
+rudy3
+echo r"0xX4H" | rev
+Kim Seohyun
+Govind S Nair
+Thomas Bertels
@@ -1,40 +1,40 @@
 <?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="storeName">اسم</string>
-    <string name="note">مذكرة</string>
+    <string name="action_add">إضافة</string>
+    <string name="noGiftCards">انقر على زر + لإضافة بطاقة، أو استوردها من قائمة ⋮</string>
+    <string name="noMatchingGiftCards">لا توجد نتائج. حاول تغيير بحثك.</string>
+    <string name="storeName">الاسم</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="exportOptionExplanation">ستتم كتابة البيانات في الموقع الذي تختاره.</string>
+    <string name="exportFailed">تعذّر إجراء عملية التصدير</string>
+    <string name="exportOptionExplanation">ستكون البيانات مكتوبة في المسار الذي تختاره</string>
    <string name="importOptionFilesystemButton">من نظام الملفات</string>
    <string name="about">حول</string>
    <string name="app_copyright_old">بناء على Loyalty Card Keychain
@@ -53,7 +53,7 @@
    <string name="exportSuccessful">تم تصدير البيانات</string>
    <string name="enter_group_name">أدخل اسم المجموعة</string>
    <string name="group_edit">تعديل المجموعة</string>
-    <string name="noGroups">اضغط زر + لإضافة مجموعات للتصنيف.</string>
+    <string name="noGroups">اضغط زر + لإضافة مجموعات للتصنيف</string>
    <string name="noGroupCards">هذه المجموعة فارغة</string>
    <string name="group_name_already_in_use">اسم المجموعة قيد الاستخدام بالفعل</string>
    <string name="group_name_is_empty">لا يمكن أن يكون اسم المجموعة فارغًا</string>
@@ -71,11 +71,11 @@
    <string name="privacy_policy">سياسة الخصوصية</string>
    <string name="accept">قبول</string>
    <string name="importCatima">الاستيراد من Catima</string>
-    <string name="importCatimaMessage">حدّد ملفك <i>catima.zip</i> تصدير من Catima للاستيراد. \nإنشئها من قائمة الاستيراد / التصدير لتطبيق Catima آخر بالضغط على تصدير هناك أولاً.</string>
+    <string name="importCatimaMessage">حدّد ملفك تصدير من Catima للاستيراد.\nإنشئها من قائمة الاستيراد / التصدير لتطبيق Catima آخر بالضغط على تصدير .</string>
    <string name="importFidme">الاستيراد من FidMe</string>
-    <string name="importFidmeMessage">حدّد ملفك <i>fidme-export-request-xxxxxx.zip</i> تصدير من FidMe للاستيراد، ثم حدد أنواع الباركود يدويًا بعد ذلك. \nإنشئها من ملف تعريف FidMe الخاص بك عن طريق اختيار حماية البيانات ثم الضغط على استخراج بياناتي أولاً.</string>
+    <string name="importFidmeMessage">حدّد للتصدير من FidMe للاستيراد، ثم حدد أنواع الباركود يدويًا بعد ذلك. \nقم بإنشاءها من ملفك التعريفي في FidMe عن طريق اختيار \"حماية البيانات\" ثم النقر على \"استخراج بياناتي\".</string>
    <string name="importVoucherVault">الاستيراد من Voucher Vault</string>
-    <string name="importVoucherVaultMessage">حدّد ملفك <i>vouchervault.json</i> تصدير من Voucher Vault للاستيراد. \nإنشئها بالضغط على تصدير في Voucher Vault أولاً.</string>
+    <string name="importVoucherVaultMessage">حدّد ملفك <i>vouchervault.json</i> تصدير من Voucher Vault للاستيراد.\nإنشئها بالضغط على تصدير في Voucher Vault.</string>
    <string name="barcodeId">قيمة الباركود</string>
    <string name="sameAsCardId">نفس بطاقة الهوية</string>
    <string name="setBarcodeId">عيّن قيمة الباركود</string>
@@ -101,14 +101,6 @@
    <string name="settings_locale">لغة</string>
    <string name="settings_system_locale">النظام</string>
    <string name="setIcon">تعيين الصورة المصغرة</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">زهري</string>
-    <string name="settings_magenta_theme">أرجواني</string>
-    <string name="settings_violet_theme">البنفسجي</string>
-    <string name="settings_blue_theme">أزرق</string>
-    <string name="settings_sky_blue_theme">أزرق سماوي</string>
-    <string name="settings_green_theme">أخضر</string>
-    <string name="settings_brown_theme">بني</string>
    <string name="app_contributors">أصبح ممكنًا بواسطة: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="sort">فرز</string>
    <string name="showMoreInfo">اظهر المعلومات</string>
@@ -130,21 +122,21 @@
    <string name="archived">تمت أرشفة البطاقة</string>
    <string name="unarchived">البطاقة غير مؤرشفة</string>
    <string name="failedLaunchingPhotoPicker">تعذر العثور على تطبيق معرض مدعوم</string>
-    <string name="noGiftCardsGroup">أنشئ بعض البطاقات، ثم عيّنهم لهذه المجموعة.</string>
-    <string name="deleteTitle">مسح بطاقة</string>
+    <string name="noGiftCardsGroup">أنشئ بعض البطاقات، ثم عيّنها للمجموعة هنا</string>
+    <string name="deleteTitle">حذف البطاقة</string>
    <plurals name="selectedCardCount">
-        <item quantity="zero"><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>
+        <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="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>
@@ -158,23 +150,23 @@
        <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>
+    <string name="importOptionFilesystemExplanation">اختر ملفًا محددًا من نظام الملفات</string>
    <string name="about_title_fmt">حول <xliff:g id="app_name">%s</xliff:g></string>
    <string name="debug_version_fmt">نسخة: <xliff:g id="version">%s</xliff:g></string>
    <string name="settings_system_theme">النظام</string>
@@ -221,15 +213,13 @@
    <string name="report_error">الإبلاغ عن خطأ</string>
    <string name="sort_by_expiry">انقضاء</string>
    <string name="importLoyaltyCardKeychain">الاستيراد من Loyalty Card Keychain</string>
-    <string name="importLoyaltyCardKeychainMessage">حدّد ملفك <i>LoyaltyCardKeychain.csv</i> التصدير من Loyalty Card Keychain للاستيراد. \nإنشئها من قائمة الاستيراد / التصدير في Loyalty Card Keychain بالضغط على تصدير هناك أولاً.</string>
+    <string name="importLoyaltyCardKeychainMessage">حدد تصديرك من سلسلة مفاتيح بطاقة الولاء للتصدير.\nانشئها من قائمة استيراد/تصدير في سلسلة مفاتيح بطاقة الولاء عبر ضغط زر تصدير.</string>
    <string name="failedGeneratingShareURL">تعذر إنشاء عنوان URL قابل للمشاركة</string>
    <string name="help_translate_this_app">ساعد في ترجمة هذا التطبيق</string>
    <string name="on_google_play">على Google Play</string>
-    <string name="settings_theme_color">لون المظهر</string>
    <string name="previousCard">السابق</string>
    <string name="nextCard">التالي</string>
    <string name="failedToRetrieveImageFile">فشل في استخراج ملف الصورة</string>
-    <string name="barcodeLongPressMessage">يمكن فتح صور فقط في تطبيق معرض الصور</string>
    <string name="failedToOpenUrl">ثبت متصفح ويب أولاً</string>
    <string name="welcome">مرحبًا بك في كاتيما</string>
    <string name="updateBalanceTitle">كم أنفقت أو استلمت؟</string>
@@ -237,22 +227,21 @@
    <string name="importCards">استيراد البطاقات</string>
    <string name="newBalanceSentence">الرصيد الجديد: <xliff:g>%s</xliff:g></string>
    <string name="cameraPermissionDeniedTitle">تعذر الوصول إلى الكاميرا</string>
-    <string name="noCameraPermissionDirectToSystemSetting">لمسح الباركود، ستحتاج Catima إلى الوصول إلى الكاميرا. اضغط هنا لتغيير إعدادات الأذونات.</string>
+    <string name="noCameraPermissionDirectToSystemSetting">لمسح الباركود، ستحتاج كاتيما إلى الوصول إلى الكاميرا. اضغط هنا لتغيير إعدادات الأذونات.</string>
    <string name="updateBalance">تحديث الرصيد</string>
    <string name="updateBalanceHint">أدخل المبلغ</string>
-    <string name="storageReadPermissionRequired">الصلاحيه للوصل للتخزين مطلوبة لهذا الاجراء…</string>
+    <string name="storageReadPermissionRequired">الصلاحيه للوصول للتخزين مطلوبة لهذا الاجراء…</string>
    <string name="validFromDate">عربيه</string>
    <string name="cameraPermissionRequired">إذن للوصول إلى الكاميرا اللازمة لهذا الإجراء…</string>
    <string name="anyDate">أي تاريخ</string>
    <string name="chooseValidFromDate">اختر صالح من التاريخ</string>
    <string name="validFromSentence">صالح من:<xliff:g>%s</xliff:g></string>
    <string name="height">الطول</string>
-    <string name="permissionReadCardsDescription">اقرأ بطاقتك مع جميع التفاصيل، بما فيه الملاحضات والصور</string>
+    <string name="permissionReadCardsDescription">اقرأ بطاقتك مع جميع التفاصيل، بما فيه الملاحظات والصور</string>
    <string name="settings_display_barcode_max_brightness_summary">ظروري لعمل بعض الماسحات الضوئية</string>
    <string name="permissionReadCardsLabel">اقرأ بطاقات كاتيما</string>
    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">حقوق النشر © 2019–<xliff:g>%d</xliff:g> Sylvia van Os والمساهمون</string>
    <string name="app_copyright_short">حقوق النشر © Sylvia van Os والمساهمون</string>
-    <string name="openFrontImageInGalleryApp">افتح الصورة الأمامية في تطبيق المعرض</string>
    <string name="show_name_below_image_thumbnail">إظهار الاسم أسفل الصورة المصغرة</string>
    <string name="show_validity">إظهار الصلاحية</string>
    <string name="view_online">مشاهدة حية</string>
@@ -268,7 +257,6 @@
    <string name="switchToFrontImage">التبديل إلى الصورة الأمامية</string>
    <string name="settings_allow_content_provider_read_summary">سيظل يتعين على التطبيقات طلب الإذن لمنحها حق الوصول</string>
    <string name="setBarcodeHeight">ضبط ارتفاع الباركود</string>
-    <string name="openBackImageInGalleryApp">فتح الصورة الخلفية في تطبيق المعرض</string>
    <string name="settings_allow_content_provider_read_title">السماح للتطبيقات الأخرى بالوصول إلى بياناتي</string>
    <string name="donate">تبرّع</string>
    <string name="show_archived_cards">عرض البطاقات المؤرشفة</string>
@@ -289,7 +277,7 @@
    <string name="spend">انفق</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>
@@ -300,7 +288,7 @@
    <string name="exportCancelled">تم الغاء الاستخراج</string>
    <string name="useFrontImage">استخدام صورة أمامية</string>
    <string name="useBackImage">استخدم صورة خلفية</string>
-    <string name="addFromPkpass">اختر ملف الدفتر (.pkpass)</string>
+    <string name="addFromPkpass">اختر ملف الدفتر الحساب [Passbook] (.pkpass. / pkpasses)</string>
    <string name="unsupportedFile">هذا الملف غير مدعوم</string>
    <string name="generic_error_please_retry">حدث خطأ ما</string>
    <string name="settings_use_volume_keys_navigation">بدّل البطاقات باستخدام أزرار الصوت</string>
@@ -322,4 +310,21 @@
    <string name="card_list_widget_name">قائمة البطاقات</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="card_list_widget_empty">بعد أن تضيف بطاقات الولاء في كاتيما، ستظهر هنا. وإذا كنت تملك البطاقات، تأكد من عدم وجودهن جميعا في الأرشفة.</string>
+    <string name="pleaseDoNotRotateTheDevice">نرجو منك عدم تدوير الجهاز، أو سيُلغى هذا الإجراء</string>
+    <string name="acra_catima_has_crashed">نأسف، لقد توقف <xliff:g id="app_name">%s</xliff:g>. ساعدنا في إصلاح هذه المشكلة من خلال إرسال تقرير للأخطاء.</string>
+    <string name="acra_explain_crash">بقدر الإمكان، نرجو منك أن تضيف مزيدا من المعلومات عمَّ كنت تفعل هنا:</string>
+    <string name="acra_crash_email_subject">تقرير الأخطاء لـ<xliff:g id="app_name">%s</xliff:g></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>
+    <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>
+    <string name="nfc_blocked_while_viewing_card">NFC موقوف</string>
+    <string name="change_settings">تغير الاعدادات</string>
+    <string name="nfc_block_system_error">فشل في ايقاف NFC</string>
 </resources>
@@ -10,7 +10,7 @@
    <string name="action_add">Дадаць</string>
    <string name="app_name">Catima</string>
    <string name="action_search">Пошук</string>
-    <string name="noGiftCards">Націсніце кнопку + плюс, каб дадаць картку, або імпартуйце праз меню ⋮.</string>
+    <string name="noGiftCards">Націсніце кнопку + плюс, каб дадаць картку, або імпартуйце праз меню ⋮</string>
    <string name="storeName">Назва</string>
    <string name="star">Дадаць у абраныя</string>
    <string name="unstar">Выдаліць з абраных</string>
@@ -37,7 +37,7 @@
    <string name="storageReadPermissionRequired">Для гэтага дзеяння патрабуецца дазвол на чытанне сховішча…</string>
    <string name="cameraPermissionRequired">Для гэтага дзеяння патрабуецца дазвол на доступ да камеры…</string>
    <string name="permissionReadCardsLabel">Чытаць карты Catima</string>
-    <string name="exportOptionExplanation">Даныя будуць запісаны ў выбранае вамі месца.</string>
+    <string name="exportOptionExplanation">Даныя будуць запісаны ў выбранае вамі месца</string>
    <string name="importOptionFilesystemExplanation">Выберыце пэўны файл з файлавай сістэмы.</string>
    <string name="importOptionFilesystemButton">З файлавай сістэмы</string>
    <string name="about">Аб праграме</string>
@@ -65,7 +65,7 @@
    <string name="importExport">Імпарт/Экспарт</string>
    <string name="importOptionFilesystemTitle">Імпарт з файлавай сістэмы</string>
    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Аўтарскае права © 2019–<xliff:g>%d</xliff:g> Sylvia van Os і суаўтары</string>
-    <string name="importExportHelp">Рэзервовае капіяванне даных дазваляе перанесці іх на іншую прыладу.</string>
+    <string name="importExportHelp">Рэзервовае капіяванне даных дазваляе перанесці іх на іншую прыладу</string>
    <string name="failedParsingImportUriError">Не атрымалася разабраць URI імпарту</string>
    <string name="exportFailedTitle">Не ўдалося экспартаваць</string>
    <string name="exportFailed">Немагчыма выканаць экспарт</string>
@@ -158,15 +158,11 @@
    <string name="settings_oled_dark">Чысты чорны фон для цёмнай тэмы</string>
    <string name="selectColor">Выбраць колер</string>
    <string name="setIcon">Задаць мініяцюру</string>
-    <string name="settings_theme_color">Колер тэмы</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_magenta_theme">Пурпурны</string>
    <string name="app_contributors">Стала магчымым дзякуючы: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="sort">Сартаваць</string>
    <string name="showMoreInfo">Паказаць інфармацыю</string>
    <string name="updateBalance">Абнавіць баланс</string>
    <string name="failedToRetrieveImageFile">Не ўдалося атрымаць файл відарысу</string>
-    <string name="barcodeLongPressMessage">У галерэі можна адкрываць толькі відарысы</string>
    <string name="sort_by_name">Назва</string>
    <string name="sort_by_most_recently_used">Частата выкарыстання</string>
    <string name="sort_by_valid_from">Дзейнічае ад</string>
@@ -206,7 +202,6 @@
    <string name="validFromSentence">Дзейнічае з: <xliff:g>%s</xliff:g></string>
    <string name="height">Вышыня</string>
    <string name="switchToFrontImage">Пераключыцца на пярэдні відарыс</string>
-    <string name="openBackImageInGalleryApp">Адкрыць задні відарыс у галерэі</string>
    <string name="setBarcodeHeight">Задаць вышыню штрыхкода</string>
    <string name="donate">Ахвяраваць</string>
    <string name="icon_header_click_text">Доўгі націск для рэдагавання мініяцюры</string>
@@ -275,8 +270,6 @@
    <string name="switchToBackImage">Пераключыцца на задні відарыс</string>
    <string name="importFidmeMessage">Каб імпартаваць, выберыце файл <i>fidme-export-request-xxxxxx.zip</i> з FidMe, а потым уручную выберыце тыпы штрыхкодаў. \nСтварыце яго з вашага профілю FidMe, выбраўшы \"Абарону даных\", а затым націснуўшы \"Выняць мае даныя\".</string>
    <string name="importCatimaMessage">Каб імпартаваць, выберыце файл <i>catima.zip</i> з Catima. \nСтварыце яго з меню \"Імпарт/Экспарт\" іншай праграмы Catima, спачатку націснуўшы там \"Экспарт\".</string>
-    <string name="settings_sky_blue_theme">Нябесна-блакітны</string>
-    <string name="settings_brown_theme">Карычневы</string>
    <string name="switchToBarcode">Пераключыцца на штрыхкод</string>
    <string name="settings_locale">Мова</string>
    <plurals name="groupCardCountWithArchived">
@@ -288,16 +281,11 @@
    <string name="unarchived">Карта разархівавана</string>
    <string name="updateBarcodeQuestionText">Вы змянілі ID. Вы хочаце таксама абнавіць штрыхкод, каб выкарыстоўваць тое ж значэнне?</string>
    <string name="no">Не</string>
-    <string name="settings_pink_theme">Ружовы</string>
    <string name="settings_system_locale">Сістэма</string>
-    <string name="settings_violet_theme">Фіялетавы</string>
    <string name="multipleBarcodesFoundPleaseChooseOne">Які са знойдзеных штрыхкодаў вы хочаце выкарыстоўваць?</string>
-    <string name="settings_blue_theme">Сіні</string>
-    <string name="settings_green_theme">Зялёны</string>
    <string name="report_error">Паведаміць пра памылку</string>
    <string name="failedLaunchingPhotoPicker">Не атрымалася знайсці праграму для галерэі, якая падтрымліваецца</string>
    <string name="unsupportedFile">Гэты файл не падтрымліваецца</string>
-    <string name="openFrontImageInGalleryApp">Адкрыць пярэдні відарыс у галерэі</string>
    <string name="field_must_not_be_empty">Поле не павінна быць пустым</string>
    <string name="add_manually_warning_title">Рэкамендуецца сканаванне</string>
    <string name="errorReadingFile">Не атрымалася прачытаць файл</string>
@@ -306,4 +294,19 @@
    <string name="generic_error_please_retry">На жаль, нешта пайшло не так, паспрабуйце яшчэ раз...</string>
    <string name="setBarcodeWidth">Задаць шырыню штрыхкода</string>
    <string name="app_license">Свабоднае копілефт праграмнае забеспячэнне, ліцэнзаванае паводле GPLv3+</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_explain_crash">Калі магчыма, дадайце больш падрабязную інфармацыю пра тое, што вы тут рабілі:</string>
+    <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="card_list_widget_name">Спіс карт</string>
+    <string name="card_list_widget_empty">Пасля таго, як вы дадасце некалькі картак лаяльнасці ў Catima, яны з\'явяцца тут. Калі ў вас ёсць карты, пераканайцеся, што яны не ўсе заархіваваны.</string>
+    <string name="acra_catima_has_crashed">Прабачце, але ў праграме <xliff:g id="app_name">%s</xliff:g> адбыўся збой. Калі ласка, дапамажыце нам выправіць гэту праблему, даслаўшы нам справаздачу аб памылцы.</string>
+    <string name="back">Назад</string>
+    <string name="copy_value">Скапіяваць значэнне</string>
+    <string name="copied_to_clipboard">Скапіявана ў буфер абмену</string>
+    <string name="nothing_to_copy">Значэнне не знойдзенае</string>
+    <string name="barcodeEncoding">Кадыяванне штрых-кодаў</string>
 </resources>
@@ -143,15 +143,6 @@
        <item quantity="other">Желаете ли тези <xliff:g>%d</xliff:g> карти да бъдат премахнати\?</item>
    </plurals>
    <string name="app_contributors">Осъществено от: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="settings_brown_theme">Кафяво</string>
-    <string name="settings_green_theme">Зелено</string>
-    <string name="settings_sky_blue_theme">Небесносиньо</string>
-    <string name="settings_blue_theme">Синьо</string>
-    <string name="settings_violet_theme">Виолетово</string>
-    <string name="settings_magenta_theme">Цикламено</string>
-    <string name="settings_pink_theme">Розово</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Цвят на темата</string>
    <string name="settings_system_locale">Система</string>
    <string name="settings_locale">Език</string>
    <string name="noGroupCards">Групата е празна</string>
@@ -207,7 +198,6 @@
    <string name="nextCard">Следваща</string>
    <string name="failedToOpenUrl">Първо инсталирайте уеб браузър</string>
    <string name="welcome">Добре дошли при Катима</string>
-    <string name="barcodeLongPressMessage">В приложението галерия могат да бъдат отваряни само изображения</string>
    <string name="failedToRetrieveImageFile">Не е възможно извличане на изображение</string>
    <string name="noCameraPermissionDirectToSystemSetting">За да сканирате щрихкодове с Catima е необходим достъп до камерата. За да промените разрешението докоснете тук.</string>
    <string name="updateBalanceTitle">Колко е похарчено или получено?</string>
@@ -227,8 +217,6 @@
    <string name="switchToFrontImage">Показване на предната страна</string>
    <string name="switchToBackImage">Показване на задната страна</string>
    <string name="switchToBarcode">Показване на щрихкода</string>
-    <string name="openFrontImageInGalleryApp">Отваряне на изображението на предната страна в приложение за преглед за изображения</string>
-    <string name="openBackImageInGalleryApp">Отваряне на изображението на задната страна в приложение за преглед за изображения</string>
    <string name="setBarcodeHeight">Задаване на височина на щрихкода</string>
    <string name="donate">Даряване</string>
    <string name="icon_header_click_text">Задръжте, за да промените миниатюрата</string>
@@ -305,4 +293,14 @@
    <string name="pref_enable_acra">Питане преди изпращане на доклад за срив</string>
    <string name="pref_enable_acra_summary">Когато е отметнато, при срив ще ви бъде предложено да докладвате за него. Докладите никога не се изпращат автоматично.</string>
    <string name="acra_explain_crash">Ако е възможно добавете подробности за вашите действия:</string>
+    <string name="copy_value">Копиране на стойността</string>
+    <string name="copied_to_clipboard">Копирано</string>
+    <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>
+    <string name="nfc_block_system_error">Грешка при спиране на NFC</string>
 </resources>
@@ -50,15 +50,6 @@
    <string name="turn_flashlight_off">টর্চলাইট বন্ধ করুন</string>
    <string name="settings_locale">লোকেল</string>
    <string name="settings_system_locale">সিস্টেম লোকেল</string>
-    <string name="settings_theme_color">থিম রঙ</string>
-    <string name="settings_catima_theme">কটিমা থিম</string>
-    <string name="settings_pink_theme">গোলাপী থিম</string>
-    <string name="settings_magenta_theme">ম্যাজেন্টা থিম</string>
-    <string name="settings_violet_theme">ভায়োলেট থিম</string>
-    <string name="settings_blue_theme">নীল থিম</string>
-    <string name="settings_sky_blue_theme">আকাশী নীল থিম</string>
-    <string name="settings_green_theme">সবুজ থিম</string>
-    <string name="settings_brown_theme">বাদামী থিম</string>
    <string name="sort">সাজান</string>
    <string name="sort_by_name">নামের দ্বারা সাজান</string>
    <string name="sort_by_most_recently_used">সর্বাধিক সম্প্রতি ব্যবহৃত দ্বারা সাজান</string>
@@ -202,7 +193,6 @@
    <string name="settings_oled_dark">অন্ধকার থিমের জন্য খাঁটি কালো পটভূমি</string>
    <string name="setIcon">আইকন সেট করুন</string>
    <string name="updateBalance">ব্যালেন্স আপডেট করুন</string>
-    <string name="barcodeLongPressMessage">গ্যালারি অ্যাপে শুধুমাত্র ছবি খোলা যাবে</string>
    <string name="translate_platform">Weblate-এ</string>
    <string name="on_google_play">Google Play-তে</string>
    <string name="shortcutSelectCard">একটি কার্ড নির্বাচন করুন</string>
@@ -234,8 +224,6 @@
    <string name="switchToBackImage">পিছনের ছবিটিতে সুইচ করুন</string>
    <string name="switchToFrontImage">সামনের ছবিটিতে সুইচ করুন</string>
    <string name="switchToBarcode">বারকোডে সুইচ করুন</string>
-    <string name="openFrontImageInGalleryApp">সামনের ছবিটি গ্যালারি অ্যাপে খুলুন</string>
-    <string name="openBackImageInGalleryApp">পিছনের ছবিটি গ্যালারি অ্যাপে খুলুন</string>
    <string name="setBarcodeHeight">বারকোডের উচ্চতা সেট করুন</string>
    <string name="icon_header_click_text">দীর্ঘক্ষন টাচ করে থাম্বনেইল এডিট করবেন</string>
    <string name="show_balance">ব্যালান্স দেখান</string>
@@ -2,10 +2,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="settings_locale">ভাষা</string>
    <string name="action_search">খুঁজুন</string>
-    <string name="settings_pink_theme">গুলাপি</string>
-    <string name="settings_blue_theme">নীল</string>
-    <string name="settings_green_theme">সবুজ</string>
-    <string name="settings_brown_theme">বাদামি</string>
    <string name="save">সংরক্ষণ</string>
    <string name="cardId">কার্ড আইডি</string>
    <string name="barcodeType">বারকোডের ধরন</string>
@@ -19,7 +15,6 @@
    <string name="all">সকল</string>
    <string name="never">কখনো না</string>
    <string name="currency">মুদ্রা</string>
-    <string name="settings_violet_theme">বেগুনি</string>
    <string name="no">না</string>
    <string name="nextCard">পরবর্তী</string>
    <string name="action_add">যুক্ত করুন</string>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
    <string name="save">Snimi</string>
    <string name="cancel">Odustani</string>
    <string name="unstar">Ukloni iz omiljenih</string>
@@ -8,15 +8,15 @@
    <string name="note">Zabilješka</string>
    <string name="storeName">Ime</string>
    <string name="noMatchingGiftCards">Nema rezultata. Pokušaj promijeniti pretragu.</string>
-    <string name="noGiftCards">Kliknite + Plus dugme da dodate kartu ili uvezete nešto iz menija prvo.</string>
+    <string name="noGiftCards">Kliknite na dugme + plus da biste dodali karticu ili je uvezite iz ⋮ menija</string>
    <string name="action_add">Dodaj</string>
    <string name="all">Sve</string>
-    <string name="noGroupCards">Ova grupa ne sadrži nikakve karte</string>
-    <string name="noGroups">Kliknite + Plus dugme da dodate grupe za kategorizaciju prvo.</string>
+    <string name="noGroupCards">Ova grupa je prazna</string>
+    <string name="noGroups">Kliknite na dugme + plus da biste dodali grupe za kategorizaciju</string>
    <string name="groups">Grupe</string>
    <string name="enter_group_name">Unesite ime grupe</string>
-    <string name="exportSuccessful">Podaci o kartama izvožen</string>
-    <string name="importSuccessful">Uvezeni podaci o kartama</string>
+    <string name="exportSuccessful">Izvezeni podaci</string>
+    <string name="importSuccessful">Uvezeni podaci</string>
    <string name="intent_import_card_from_url_share_text">Želim podijeliti čestitku s tobom</string>
    <string name="settings_disable_lockscreen_while_viewing_card">Spriječi zaključavanje ekrana</string>
    <string name="settings_keep_screen_on">Zadrži ekran</string>
@@ -28,47 +28,38 @@
    <string name="importLoyaltyCardKeychain">Uvezi iz Loyalty Card Keychain</string>
    <string name="importVoucherVault">Uvezi iz trezora vaučer</string>
    <string name="barcodeId">Barcode vrijednost</string>
-    <string name="sameAsCardId">Isto kao i kartica</string>
+    <string name="sameAsCardId">Isto kao i ID</string>
    <string name="setBarcodeId">Postavi vrijednost za bar kod</string>
    <string name="unsupportedBarcodeType">Ovaj bar kod još nije prikazan. Ona može biti podržana u kasnijoj verziji app.</string>
-    <string name="wrongValueForBarcodeType">Izabrana vrijednost nije izvršna</string>
+    <string name="wrongValueForBarcodeType">Vrijednost nije važeća za odabrani tip barkoda</string>
    <string name="intent_import_card_from_url_share_multiple_text">Želim podijeliti karte s tobom</string>
-    <string name="frontImageDescription">Slika kartice</string>
-    <string name="backImageDescription">Slika pozadine kartice</string>
+    <string name="frontImageDescription">Prednja slika</string>
+    <string name="backImageDescription">Stražnja slika</string>
    <string name="photos">Slike</string>
    <string name="setFrontImage">Postavi naslovnu sliku</string>
    <string name="setBackImage">Vrati sliku</string>
    <string name="removeImage">Ukloni sliku</string>
    <string name="takePhoto">Slikaj</string>
    <string name="updateBarcodeQuestionTitle">Ažurirati bar kod vrijednost\?</string>
-    <string name="updateBarcodeQuestionText">Promijenio si auto. Da li želite ažurirati bar kod koristiti istu vrijednost\?</string>
+    <string name="updateBarcodeQuestionText">Promijenili ste ID. Želite li ažurirati i barkod da koristi istu vrijednost?</string>
    <string name="yes">Da</string>
    <string name="no">Ne.</string>
-    <string name="passwordRequired">Upišite šifru</string>
-    <string name="failedGeneratingShareURL">Ne mogu generisati oštriji URL. Molim vas, prijavite ovo.</string>
+    <string name="passwordRequired">Unesite lozinku</string>
+    <string name="failedGeneratingShareURL">Nije moguće generirati URL za dijeljenje</string>
    <string name="turn_flashlight_on">Upali lampu</string>
    <string name="turn_flashlight_off">Ugasi lampu</string>
    <string name="settings_locale">Jezik</string>
    <string name="settings_system_locale">Sistem</string>
-    <string name="settings_theme_color">Boja teme</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Ružičasto</string>
-    <string name="settings_magenta_theme">Ljubičasto</string>
-    <string name="settings_violet_theme">Ljubičasto</string>
-    <string name="settings_blue_theme">Plavo</string>
-    <string name="settings_sky_blue_theme">Nebo plavo</string>
-    <string name="settings_green_theme">Zeleno</string>
-    <string name="settings_brown_theme">Braun</string>
    <string name="sort">Poništi sortiranje</string>
    <string name="sort_by_name">Ime</string>
-    <string name="sort_by_most_recently_used">Nedavno Korišten</string>
+    <string name="sort_by_most_recently_used">Najnovije korišteno</string>
    <string name="sort_by_expiry">Sajam</string>
-    <string name="reverse">Rikverc</string>
+    <string name="reverse">...obrnutim redoslijedom</string>
    <string name="sort_by">Sortiraj</string>
-    <string name="noCardExistsError">Nisam mogao pronaći tu karticu</string>
+    <string name="noCardExistsError">Nisam mogao/la pronaći tu karticu</string>
    <string name="noCardsMessage">Dodaj prvo kartu</string>
-    <string name="addCardTitle">Dodaj Kartu</string>
-    <string name="editCardTitle">Izmijeni Karticu</string>
+    <string name="addCardTitle">Dodaj karticu</string>
+    <string name="editCardTitle">Uredi karticu</string>
    <string name="sendLabel">Pošalji…</string>
    <string name="share">Podijeli</string>
    <string name="deleteConfirmation">Izbriši trajno ovu karticu\?</string>
@@ -81,25 +72,236 @@
    <string name="exportFailed">Nisam uspio izvršiti izvoz</string>
    <string name="app_copyright_old">Bazirano na Loyalty Card privjesku
 \ncopyright © 2016-2020 Branden Archer</string>
-    <string name="noGiftCardsGroup">Kreirajte kartice, i dodajte ih ovdje u grupu.</string>
-    <string name="importExportHelp">Backupovanje vaših podataka omogućava njihov prenos na drugi uređaj.</string>
+    <string name="noGiftCardsGroup">Napravite nekoliko kartica, a zatim ih dodijelite grupi ovdje</string>
+    <string name="importExportHelp">Pravljenje sigurnosne kopije podataka omogućava njihovo premještanje na drugi uređaj</string>
    <string name="importSuccessfulTitle">Uvezeno</string>
    <string name="exportFailedTitle">Izvoz neuspješan</string>
    <string name="scanCardBarcode">Skeniraj barkod</string>
    <string name="cardShortcut">Prečica kartice</string>
-    <string name="failedParsingImportUriError">Nisam uspio parsirati URI za uvoz</string>
-    <string name="importExport">Uvoz/Izvoz</string>
+    <string name="failedParsingImportUriError">Nemogu analizirati URI za uvoz</string>
+    <string name="importExport">Uvoz/izvoz</string>
    <string name="exportName">Izvoz</string>
    <string name="importFailedTitle">Uvoz neuspješan</string>
    <string name="importFailed">Nisam uspio odraditi uvoz</string>
    <string name="exportSuccessfulTitle">Izvezeno</string>
    <string name="importing">Uvozim…</string>
    <string name="exporting">Izvozim…</string>
-    <string name="exportOptionExplanation">Ovi podaci će biti zapisani na lokaciju po Vašoj želji.</string>
+    <string name="exportOptionExplanation">Podaci će biti zapisani na lokaciju po vašem izboru</string>
    <string name="importOptionFilesystemTitle">Uvoz iz file sistema</string>
-    <string name="importOptionFilesystemExplanation">Izaberite specifični file iz file sistema.</string>
+    <string name="importOptionFilesystemExplanation">Odaberite određenu datoteku iz datotečnog sistema</string>
    <string name="importOptionFilesystemButton">Iz file sistema</string>
    <string name="about">O</string>
    <string name="noBarcode">Nema barkoda</string>
    <string name="deleteTitle">Obriši karticu</string>
-</resources>
+    <string name="app_name">Catima</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> odabran</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> odabranih</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> odabrano</item>
+    </plurals>
+    <string name="cameraPermissionRequired">Za ovu radnju potrebna je dozvola za pristup kameri…</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Obriši <xliff:g>%d</xliff:g> karticu</item>
+        <item quantity="few">Obriši <xliff:g>%d</xliff:g> kartice</item>
+        <item quantity="other">Obriši <xliff:g>%d</xliff:g> kartica</item>
+    </plurals>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Trajno izbrisati ovu <xliff:g>%d</xliff:g> karticu?</item>
+        <item quantity="few">Trajno izbrisati ove <xliff:g>%d</xliff:g> kartice?</item>
+        <item quantity="other">Trajno izbrisati ovih <xliff:g>%d</xliff:g> kartica?</item>
+    </plurals>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> kartica</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> kartice</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kartica</item>
+    </plurals>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> poen</item>
+        <item quantity="few"><xliff:g>%s</xliff:g> poena</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> poena</item>
+    </plurals>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> kartica (<xliff:g id="archivedCount">%2$d</xliff:g> archived)</item>
+        <item quantity="few"><xliff:g>%1$d</xliff:g> kartice (<xliff:g id="archivedCount">%2$d</xliff:g> archived)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> kartica (<xliff:g id="archivedCount">%2$d</xliff:g> archived)</item>
+    </plurals>
+    <string name="barcodeImageDescriptionWithType">Slika <xliff:g>%s</xliff:g> barkoda</string>
+    <string name="storageReadPermissionRequired">Za ovu radnju potrebna je dozvola za čitanje pohrane…</string>
+    <string name="permissionReadCardsLabel">Čitajte Catima kartice</string>
+    <string name="permissionReadCardsDescription">da pročita vaše Catima kartice i sve njihove detalje, uključujući bilješke i slike</string>
+    <string name="cameraPermissionDeniedTitle">Nije bilo moguće pristupiti kameri</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Za skeniranje barkodova, Catima će trebati pristup vašoj kameri. Dodirnite ovdje da promijenite postavke dozvola.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Autorska prava © 2019–<xliff:g>%d</xliff:g> Sylvia van Os i saradnici</string>
+    <string name="app_copyright_short">Autorska prava © Sylvia van Os i saradnici</string>
+    <string name="app_license">Slobodni softver zaštićen autorskim pravom, licenciran pod GPLv3+</string>
+    <string name="about_title_fmt">O aplikaciji <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">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="selectBarcodeTitle">Odaberite barkod</string>
+    <string name="thumbnailDescription">Sličica</string>
+    <string name="settings">Postavke</string>
+    <string name="failedOpeningFileManager">Nije moguće otvoriti upravitelj datoteka</string>
+    <string name="moveUp">Pomakni se prema gore</string>
+    <string name="moveDown">Pomakni se prema dolje</string>
+    <string name="leaveWithoutSaveTitle">Izlaz</string>
+    <string name="leaveWithoutSaveConfirmation">Napustiti bez spremanja?</string>
+    <string name="addManually">Ručno unesite barkod</string>
+    <string name="addFromImage">Odaberite sliku iz galerije</string>
+    <string name="groupsList">Grupe: <xliff:g>%s</xliff:g></string>
+    <string name="editGroup">Grupa za uređivanje: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Ističe: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Isteklo: <xliff:g>%s</xliff:g></string>
+    <string name="balanceSentence">Stanje: <xliff:g>%s</xliff:g></string>
+    <string name="card">Kartica</string>
+    <string name="editBarcode">Uredi barkod</string>
+    <string name="expiryDate">Datum isteka</string>
+    <string name="never">Nikad</string>
+    <string name="chooseExpiryDate">Odaberite datum isteka</string>
+    <string name="moveBarcodeToTopOfScreen">Pomaknite barkod na vrh ekrana</string>
+    <string name="noBarcodeFound">Nije pronađen barkod</string>
+    <string name="errorReadingImage">Nisam mogao/la pročitati sliku</string>
+    <string name="balance">Stanje</string>
+    <string name="currency">Valuta</string>
+    <string name="points">Bodovi</string>
+    <string name="balanceParsingFailed">Nevažeći saldo</string>
+    <string name="chooseImportType">Uvoz podataka iz</string>
+    <string name="app_loyalty_card_keychain">Privjesak za ključeve s karticom vjernosti</string>
+    <string name="privacy_policy">Politika privatnosti</string>
+    <string name="accept">Prihvati</string>
+    <string name="importFidme">Uvoz iz FidMe-a</string>
+    <string name="importFidmeMessage">Odaberite izvoz iz FidMe-a za uvoz i nakon toga ručno odaberite vrste barkodova. \nKreirajte ga iz svog FidMe profila odabirom Zaštita podataka, a zatim pritiskom na Izdvoji moje podatke.</string>
+    <string name="importLoyaltyCardKeychainMessage">Odaberite svoj izvoz iz Privjeska za ključeve s karticom vjernosti za uvoz.\nKreirajte ga iz menija Uvoz/Izvoz u Privjesku za ključeve s karticom vjernosti pritiskom na Izvoz.</string>
+    <string name="importVoucherVaultMessage">Odaberite izvoz iz Voucher Vaulta za uvoz. \nKreirajte ga pritiskom na Izvoz u Voucher Vaultu.</string>
+    <string name="switchToBarcode">Prebaci na barkod</string>
+    <string name="switchToBackImage">Prebaci na sliku iz pozadine</string>
+    <string name="switchToFrontImage">Prebaci na prednju sliku</string>
+    <string name="height">Visina</string>
+    <string name="validFromSentence">Važi od: <xliff:g>%s</xliff:g></string>
+    <string name="chooseValidFromDate">Odaberite datum važenja od</string>
+    <string name="anyDate">Bilo koji datum</string>
+    <string name="validFromDate">Vrijedi od</string>
+    <string name="newBalanceSentence">Novo stanje: <xliff:g>%s</xliff:g></string>
+    <string name="currentBalanceSentence">Trenutno stanje: <xliff:g>%s</xliff:g></string>
+    <string name="updateBalanceHint">Unesite iznos</string>
+    <string name="updateBalanceTitle">Koliko ste potrošili ili primili?</string>
+    <string name="importCards">Uvezi kartice</string>
+    <string name="welcome">Dobrodošli u Catima</string>
+    <string name="failedToOpenUrl">Prvo instalirajte web preglednik</string>
+    <string name="nextCard">Sljedeće</string>
+    <string name="previousCard">Prethodno</string>
+    <string name="failedLaunchingPhotoPicker">Nemogu pronaći podržani alat za odabir slika</string>
+    <string name="unarchived">Kartica je vraćena iz arhive</string>
+    <string name="archived">Kartica je arhivirana</string>
+    <string name="unarchive">Vrati iz arhive</string>
+    <string name="archive">Arhiva</string>
+    <string name="duplicateCard">Duplikat</string>
+    <string name="include_if_asking_support">Ako želite zatražiti podršku, uključite sljedeće informacije:</string>
+    <string name="starred">Označeno zvjezdicom</string>
+    <string name="options">Opcije</string>
+    <string name="shortcutSelectCard">Odaberite karticu</string>
+    <string name="translate_platform">na Weblateu</string>
+    <string name="report_error">Prijavi grešku</string>
+    <string name="on_google_play">na Google Play</string>
+    <string name="rate_this_app">Ocijenite ovu aplikaciju</string>
+    <string name="and_data_usage">i korištenje podataka</string>
+    <string name="on_github">na GitHubu</string>
+    <string name="source_repository">Izvorni repozitorij</string>
+    <string name="license">Licenca</string>
+    <string name="help_translate_this_app">Pomozite u prevođenju ove aplikacije</string>
+    <string name="credits">Zasluge</string>
+    <string name="version_history">Historija verzija</string>
+    <string name="sort_by_valid_from">Vrijedi od</string>
+    <string name="failedToRetrieveImageFile">Neuspjevam preuzimanje slikovne datoteke</string>
+    <string name="updateBalance">Ažuriraj stanje</string>
+    <string name="showMoreInfo">Prikaži informacije</string>
+    <string name="app_contributors">Omogućeno zahvaljujući: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="setIcon">Postavi sličicu</string>
+    <string name="selectColor">Odaberite boju</string>
+    <string name="settings_oled_dark_summary">Smanjuje potrošnju baterije na OLED ekranima</string>
+    <string name="settings_oled_dark">Čisto crna pozadina za tamnu temu</string>
+    <string name="exportPasswordHint">Unesite lozinku</string>
+    <string name="exportPassword">Postavite lozinku za zaštitu izvoza (opcionalno)</string>
+    <string name="back">Nazad</string>
+    <string name="barcodeEncoding">Kodiranje barkoda</string>
+    <string name="nothing_to_copy">Nije pronađena vrijednost</string>
+    <string name="settings_dark_theme">Tamno</string>
+    <string name="settings_display_barcode_max_brightness">Posvijetli ekran</string>
+    <string name="settings_display_barcode_max_brightness_summary">Neophodno za rad nekih skenera</string>
+    <string name="settings_keep_screen_on_summary">Onemogućava istek vremena ekrana tokom pregleda kartice</string>
+    <string name="settings_disable_lockscreen_while_viewing_card_summary">Onemogućava zaključavanje ekrana tokom pregleda kartice</string>
+    <string name="settings_allow_content_provider_read_title">Dozvoli drugim aplikacijama pristup mojim podacima</string>
+    <string name="settings_allow_content_provider_read_summary">Aplikacije će i dalje morati tražiti dozvolu za pristup</string>
+    <string name="settings_use_volume_keys_navigation">Prebacivanje kartica pomoću tipki za jačinu zvuka</string>
+    <string name="settings_use_volume_keys_navigation_summary">Koristite tipke za jačinu zvuka da promijenite koja se kartica prikazuje</string>
+    <string name="group_edit">Uredi grupu</string>
+    <string name="group_name_already_in_use">Naziv grupe se već koristi</string>
+    <string name="group_name_is_empty">Naziv grupe ne smije biti prazan</string>
+    <string name="group_updated">Grupa ažurirana</string>
+    <string name="deleteConfirmationGroup">Izbrisati grupu?</string>
+    <string name="setBarcodeHeight">Postavi visinu barkoda</string>
+    <string name="donate">Donirajte</string>
+    <string name="icon_header_click_text">Dugo pritisnite za uređivanje sličice</string>
+    <string name="show_name_below_image_thumbnail">Prikaži ime ispod sličice slike</string>
+    <string name="show_note">Prikaži bilješku</string>
+    <string name="show_balance">Prikaži stanje</string>
+    <string name="show_validity">Prikaži validnost</string>
+    <string name="settings_category_title_cards">Prikaz kartice</string>
+    <string name="settings_category_title_cards_overview">Pregled kartica</string>
+    <string name="settings_column_count_portrait">Kolone u portretnom načinu rada</string>
+    <string name="settings_column_count_landscape">Kolone u pejzažnom načinu rada</string>
+    <string name="settings_automatic_column_count">Automatski</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="settings_column_count_6">6</string>
+    <string name="settings_column_count_7">7</string>
+    <string name="settings_category_title_general">Općenito</string>
+    <string name="settings_category_title_privacy">Privatnost</string>
+    <string name="action_display_options">Opcije prikaza</string>
+    <string name="show_archived_cards">Prikaži arhivirane kartice</string>
+    <string name="view_online">Pogledajte online</string>
+    <string name="action_more_options">Više opcija</string>
+    <string name="addWithoutBarcode">Dodajte karticu bez barkoda</string>
+    <string name="enter_card_id">Unesite ID broj ili tekst sa vaše kartice</string>
+    <string name="card_id_must_not_be_empty">ID kartice ne smije biti prazan</string>
+    <string name="add_a_card_in_a_different_way">Dodajte karticu na drugačiji način</string>
+    <string name="field_must_not_be_empty">Polje ne smije biti prazno</string>
+    <string name="manually_enter_barcode_instructions">Unesite ID broj ili tekst sa vaše kartice i pritisnite barkod koji izgleda kao onaj na vašoj kartici.</string>
+    <string name="add_manually_warning_title">Preporučuje se skeniranje</string>
+    <string name="add_manually_warning_message">Za neke kartice, vrijednost barkoda se razlikuje od broja napisanog na kartici. Zbog toga, ručni unos barkoda možda neće uvijek funkcionirati. Preporučuje se skeniranje barkoda kamerom. Želite li i dalje nastaviti?</string>
+    <string name="continue_">Nastavi</string>
+    <string name="spend">Potroši</string>
+    <string name="receive">Primi</string>
+    <string name="amountParsingFailed">Nevažeći iznos</string>
+    <string name="addFromPdfFile">Odaberite PDF datoteku</string>
+    <string name="errorReadingFile">Nisam mogao pročitati datoteku</string>
+    <string name="failedLaunchingFileManager">Nije pronađen podržani upravitelj datoteka</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Koji od pronađenih barkodova želite koristiti?</string>
+    <string name="pageWithNumber">Stranica <xliff:g>%d</xliff:g></string>
+    <string name="noCameraFoundGuideText">Izgleda da vaš uređaj nema kameru. Ako je ima, pokušajte ponovo pokrenuti uređaj. U suprotnom, koristite dugme Više opcija ispod da biste dodali barkod na drugi način.</string>
+    <string name="importCancelled">Uvoz otkazan</string>
+    <string name="exportCancelled">Izvoz otkazan</string>
+    <string name="useFrontImage">Koristi prednju sliku</string>
+    <string name="useBackImage">Koristi sliku sa zadnje strane</string>
+    <string name="addFromPkpass">Odaberite Passbook datoteku (.pkpass / .pkpasses)</string>
+    <string name="unsupportedFile">Ova datoteka nije podržana</string>
+    <string name="generic_error_please_retry">Došlo je do greške</string>
+    <string name="width">Širina</string>
+    <string name="card_list_widget_name">Lista kartica</string>
+    <string name="setBarcodeWidth">Postavi širinu barkoda</string>
+    <string name="card_list_widget_empty">Nakon što dodate neke kartice vjernosti u Catima, one će se pojaviti ovdje. Ako imate kartice, provjerite 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 vas da ne rotirate uređaj, jer će to prekinuti radnju</string>
+    <string name="acra_catima_has_crashed">Žao nam je, ali aplikacija <xliff:g id="app_name">%s</xliff:g> se srušila. Molimo vas da nam pomognete da riješimo ovaj problem slanjem izvještaja o grešci.</string>
+    <string name="acra_explain_crash">Ako je moguće, molimo vas da dodate više detalja o tome šta ste ovdje radili:</string>
+    <string name="acra_crash_email_subject">Izvještaj o padu aplikacije <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="pref_enable_acra">Zatraži slanje izvještaja o padu programa</string>
+    <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>
@@ -42,10 +42,6 @@
    <string name="leaveWithoutSaveConfirmation">Vols sortir sense grabar?</string>
    <string name="passwordRequired">Introdueixi el password</string>
    <string name="turn_flashlight_on">Encendre el llum flash</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_violet_theme">Violeta</string>
-    <string name="settings_blue_theme">Blau</string>
-    <string name="settings_green_theme">Verd</string>
    <string name="translate_platform">a la Pàgina Web</string>
    <string name="report_error">Informar un Error</string>
    <string name="archived">Targeta arxivada</string>
@@ -74,10 +70,8 @@
    </plurals>
    <string name="importOptionFilesystemExplanation">Escull un fitxer especific del sistema de fitxers</string>
    <string name="no">No</string>
-    <string name="settings_pink_theme">Rosa</string>
    <string name="sort">Ordenar</string>
    <string name="failedToRetrieveImageFile">Ha fallat l\'obtenció del fitxer d\'imatge</string>
-    <string name="barcodeLongPressMessage">Les imatges només es poden obrir desde la app galeria</string>
    <string name="settings_category_title_privacy">Privacitat</string>
    <plurals name="deleteCardsTitle">
        <item quantity="one">Eliminar <xliff:g>%d</xliff:g> targeta</item>
@@ -146,7 +140,6 @@
    <string name="settings_oled_dark">Negre pur en el tema fosc</string>
    <string name="selectColor">Sel•leccioni el color</string>
    <string name="setIcon">Setegi la miniatura</string>
-    <string name="settings_theme_color">Color del tema</string>
    <string name="app_contributors">Fet possible per: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="updateBalance">Actualitzar el balanç</string>
    <string name="sort_by_name">Nom</string>
@@ -173,16 +166,13 @@
    <string name="noCardsMessage">Afegeix primer una targeta</string>
    <string name="noCardExistsError">No s\'ha pogut trobar aquesta targeta</string>
    <string name="failedParsingImportUriError">No s\'ha pogut analitzar l\'URI d\'importació</string>
-    <string name="openFrontImageInGalleryApp">Obrir la imatge frontal a l\'app de galeria</string>
    <string name="settings_use_volume_keys_navigation_summary">Utilitza els botons de volum per canviar la targeta que es mostra</string>
    <string name="updateBarcodeQuestionText">Ha canviat el valor ID. Vol actualitzar també el codi de barres per uter utilitzar el mateix valor?</string>
-    <string name="settings_sky_blue_theme">Blau fluix</string>
    <string name="starred">Preferides</string>
    <string name="deleteConfirmationGroup">Vols eliminar aquest grup?</string>
    <string name="removeImage">Eliminar imatge</string>
    <string name="app_libraries">Llibreries de tercers: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="settings_display_barcode_max_brightness">Màxima iluminació</string>
-    <string name="settings_brown_theme">Marró</string>
    <string name="manually_enter_barcode_instructions">Introdueixi el ID de la targeta manualment i trii un codi de barres que s\'assembli al de la seva targeta.</string>
    <string name="rate_this_app">Valora aquesta app</string>
    <string name="exportPasswordHint">Introdueixi el password</string>
@@ -191,7 +181,6 @@
    <string name="on_github">al Github</string>
    <string name="include_if_asking_support">Si vol demanar suport tècnic, inclogui la següent informació:</string>
    <string name="newBalanceSentence">Nou balanç: <xliff:g>%s</xliff:g></string>
-    <string name="openBackImageInGalleryApp">Obrir la imatge posterior a l\'app de la galeria</string>
    <string name="generic_error_please_retry">Perdoni, alguna cosa ha anat malament, siusplau torni-ho a provar...</string>
    <string name="settings_column_count_6">6</string>
    <string name="useBackImage">Utilitzar la imatge posterior</string>
@@ -236,7 +225,6 @@
    <string name="turn_flashlight_off">Apagar el llum Flash</string>
    <string name="settings_oled_dark_summary">Redueix l\'ús de la bateria en pantalles OLED</string>
    <string name="settings_system_locale">Idioma del sistema</string>
-    <string name="settings_catima_theme">Catima</string>
    <string name="spend">Gastar</string>
    <string name="importExportHelp">Fer una còpia de seguretat de les dades permet moure-les a un altre dispositiu</string>
    <string name="importSuccessfulTitle">Importat</string>
@@ -83,15 +83,6 @@
    <string name="expiryStateSentence">Platí do: <xliff:g>%s</xliff:g></string>
    <string name="moveDown">Přesunout dolů</string>
    <string name="moveUp">Přesunout nahoru</string>
-    <string name="settings_brown_theme">Hnědá</string>
-    <string name="settings_green_theme">Zelená</string>
-    <string name="settings_sky_blue_theme">Azurová</string>
-    <string name="settings_blue_theme">Modrá</string>
-    <string name="settings_violet_theme">Fialová</string>
-    <string name="settings_magenta_theme">Purpurová</string>
-    <string name="settings_pink_theme">Růžová</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Barva motivu</string>
    <string name="settings_system_locale">Podle systému</string>
    <string name="settings_locale">Jazyk</string>
    <string name="turn_flashlight_off">Vypnout světlo</string>
@@ -212,7 +203,6 @@
    <string name="nextCard">Následující</string>
    <string name="failedToOpenUrl">Nejprve nainstalujte webový prohlížeč</string>
    <string name="welcome">Vítejte v Catima</string>
-    <string name="barcodeLongPressMessage">V aplikaci pro galerii mohou být otevírány pouze obrázky</string>
    <string name="failedToRetrieveImageFile">Nepodařilo se získat soubor obrázku</string>
    <string name="cameraPermissionDeniedTitle">Nepodařilo se získat přístup k fotoaparátu</string>
    <string name="importCards">Importovat karty</string>
@@ -232,8 +222,6 @@
    <string name="switchToFrontImage">Přepnout na přední obrázek</string>
    <string name="switchToBackImage">Přepnout na zadní obrázek</string>
    <string name="switchToBarcode">Přepnout na čárový kód</string>
-    <string name="openFrontImageInGalleryApp">Otevřít přední obrázek v aplikaci prohlížeče obrázků</string>
-    <string name="openBackImageInGalleryApp">Otevřít zadní obrázek v aplikaci prohlížeče obrázků</string>
    <string name="setBarcodeHeight">Nastavit výšku čárového kódu</string>
    <string name="donate">Přispět</string>
    <string name="icon_header_click_text">Dlouhým stisknutím miniaturu upravíte</string>
@@ -311,4 +299,14 @@
    <string name="acra_crash_email_subject">Hlášení o pádu <xliff:g id="app_name">%s</xliff:g></string>
    <string name="pref_enable_acra">Ptát se na odesílání hlášení o pádech</string>
    <string name="pref_enable_acra_summary">Pokud je povoleno, budete při pádu aplikace dotázáni na jeho nahlášení. Hlášení nejsou nikdy odesílána automaticky.</string>
+    <string name="copy_value">Kopírovat hodnotu</string>
+    <string name="copied_to_clipboard">Zkopírováno do schránky</string>
+    <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>
+    <string name="nfc_block_system_error">Nepodařilo se pozastavit NFC</string>
 </resources>
@@ -25,7 +25,7 @@
    <string name="note">Bemærk</string>
    <string name="storeName">Navn</string>
    <string name="noMatchingGiftCards">Ingen resultater. Prøv at ændre din søgning.</string>
-    <string name="noGiftCards">Klik på + plus-knappen for at tilføje et kort, eller importer kort fra ⋮ menuen.</string>
+    <string name="noGiftCards">Klik på + plus-knappen for at tilføje et kort, eller importer kort fra ⋮ menuen</string>
    <plurals name="selectedCardCount">
        <item quantity="one"><xliff:g>%d</xliff:g> valgt kort</item>
        <item quantity="other"><xliff:g>%d</xliff:g> valgte kort</item>
@@ -33,8 +33,8 @@
    <string name="exportFailed">Export konnte nicht durchgeführt werden</string>
    <string name="importing">Importiere…</string>
    <string name="exporting">Exportiere…</string>
-    <string name="importOptionFilesystemTitle">Aus Dateisystem importieren</string>
-    <string name="importOptionFilesystemExplanation">Wähle eine bestimmte Datei aus dem Dateisystem aus</string>
+    <string name="importOptionFilesystemTitle">Import vom Dateisystem</string>
+    <string name="importOptionFilesystemExplanation">Wähle eine bestimmte Datei aus dem Dateisystem</string>
    <string name="importOptionFilesystemButton">vom Dateisystem</string>
    <string name="about">Über</string>
    <string name="app_license">Freie Software, lizensiert unter der GPLv3+</string>
@@ -100,7 +100,7 @@
    <string name="importLoyaltyCardKeychain">Aus Loyalty Card Keychain importieren</string>
    <string name="importFidmeMessage">Wähle deinen „FidMe-Export“ zum Importieren und anschließend manuell die Barcodetypen aus.\nErstelle ihn aus deinem FidMe-Profil, indem du Datenschutz wählst und dann auf Meine Daten extrahieren drückst.</string>
    <string name="importFidme">Aus FidMe importieren</string>
-    <string name="importCatimaMessage">Wähle deinen „Catima-Export“ zum Importieren aus.\nErstelle diesen durch das Drücken auf Export im Import/Export-Menü in einer anderen Catima-Anwendung.</string>
+    <string name="importCatimaMessage">Wähle deinen „Catima-Export“ zum Importieren aus.\nExportiere diesen zuvor im Import/Export-Menü einer anderen Catima-Anwendung.</string>
    <string name="importCatima">Aus Catima importieren</string>
    <string name="setBarcodeId">Barcodewert festlegen</string>
    <string name="sameAsCardId">Entspricht Kartennummer</string>
@@ -144,15 +144,6 @@
    </plurals>
    <string name="settings_system_locale">System</string>
    <string name="settings_locale">Sprache</string>
-    <string name="settings_brown_theme">Braun</string>
-    <string name="settings_green_theme">Grün</string>
-    <string name="settings_sky_blue_theme">Himmelblau</string>
-    <string name="settings_blue_theme">Blau</string>
-    <string name="settings_violet_theme">Violett</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_pink_theme">Rosa</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Designfarbe</string>
    <string name="app_contributors">Ermöglicht durch: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="barcodeImageDescriptionWithType">Bild <xliff:g>%s</xliff:g> Barcode</string>
    <string name="sort_by">Sortieren nach</string>
@@ -206,7 +197,6 @@
    <string name="nextCard">Nächste</string>
    <string name="failedToOpenUrl">Bitte installiere zuerst einen Webbrowser</string>
    <string name="welcome">Willkommen bei Catima</string>
-    <string name="barcodeLongPressMessage">In der Galerie können nur Bilder geöffnet werden</string>
    <string name="failedToRetrieveImageFile">Bilddatei konnte nicht abgerufen werden</string>
    <string name="updateBalanceTitle">Wie viel hast du ausgegeben oder erhalten?</string>
    <string name="cameraPermissionDeniedTitle">Kein Zugriff auf die Kamera</string>
@@ -224,8 +214,6 @@
    <string name="anyDate">Beliebiges Datum</string>
    <string name="icon_header_click_text">Zum Bearbeiten des Vorschaubildes lang drücken</string>
    <string name="switchToBarcode">Zum Barcode wechseln</string>
-    <string name="openFrontImageInGalleryApp">Vorderseite in Bildbetrachter öffnen</string>
-    <string name="openBackImageInGalleryApp">Rückseite in Bildbetrachter öffnen</string>
    <string name="height">Höhe</string>
    <string name="switchToFrontImage">Zur Vorderseite wechseln</string>
    <string name="switchToBackImage">Zur Rückseite wechseln</string>
@@ -305,4 +293,14 @@
    <string name="acra_explain_crash">Wenn möglich, bitte übermittle mehr Details zu dem, was du hier getan hast:</string>
    <string name="acra_catima_has_crashed">Es tut uns leid, aber <xliff:g id="app_name">%s</xliff:g> ist abgestürzt. Bitte hilf uns diesen Fehler zu beheben und übermittle uns einen Absturzbericht.</string>
    <string name="pleaseDoNotRotateTheDevice">Bitte drehe nicht das Gerät, weil sonst die Aktion abbricht</string>
+    <string name="copy_value">Kopiere Betrag</string>
+    <string name="copied_to_clipboard">In die Zwischenablage kopiert</string>
+    <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>
+    <string name="nfc_block_system_error">Pausieren von NFC ist fehlgeschlagen</string>
 </resources>
@@ -137,9 +137,6 @@
    <string name="app_resources">Πηγές τρίτων: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="selectColor">Επιλογή χρώματος</string>
    <string name="setIcon">Ορισμός εικονιδίου</string>
-    <string name="settings_sky_blue_theme">Γαλάζιο</string>
-    <string name="settings_green_theme">Πράσινο</string>
-    <string name="settings_brown_theme">Καφέ</string>
    <string name="sort_by_expiry">Λήξη</string>
    <plurals name="groupCardCount">
        <item quantity="one"><xliff:g>%d</xliff:g> κάρτα</item>
@@ -187,12 +184,6 @@
    <string name="settings_locale">Γλώσσα</string>
    <string name="settings_oled_dark">Απόλυτο μαύρο φόντο για το μαύρο θέμα</string>
    <string name="settings_system_locale">Σύστημα</string>
-    <string name="settings_theme_color">Χρώμα θέματος</string>
-    <string name="settings_catima_theme">Κάτιμα</string>
-    <string name="settings_pink_theme">Ροζ</string>
-    <string name="settings_magenta_theme">Φούξια</string>
-    <string name="settings_violet_theme">Βιολετί</string>
-    <string name="settings_blue_theme">Μπλε</string>
    <string name="app_contributors">Δημιουργήθηκε από: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="showMoreInfo">Εμφάνιση πληροφοριών</string>
    <string name="sort_by_name">Όνομα</string>
@@ -209,7 +200,6 @@
    <string name="previousCard">Προηγούμενη</string>
    <string name="nextCard">Επόμενη</string>
    <string name="updateBalance">Ενημέρωση υπολοίπου</string>
-    <string name="barcodeLongPressMessage">Μόνο εικόνες μπορούν να ανοιχτούν στην εφαρμογή φωτογραφιών</string>
    <string name="noCameraPermissionDirectToSystemSetting">Για να σκανάρετε γραμμωτούς κώδικες, θα χρειαστεί πρόσβαση στην κάμερα από το Catima. Πατήστε εδώ για να δώσετε πρόσβαση.</string>
    <string name="importCards">Εισαγωγή καρτών</string>
    <string name="updateBalanceHint">Εισάγετε ποσό</string>
@@ -228,11 +218,9 @@
    <string name="switchToBarcode">Μετάβαση σε γραμμωτό κώδικα</string>
    <string name="validFromSentence">Ισχύει από: <xliff:g>%s</xliff:g></string>
    <string name="permissionReadCardsLabel">Διαβάστε τις κάρτες Catima</string>
-    <string name="openBackImageInGalleryApp">Ανοίξτε την οπίσθια εικόνα στη συλλογή εικόνων</string>
    <string name="permissionReadCardsDescription">Διάβασε τις Κάρτες σου Catima και όλες τους τις λεπτομέρειες, συμπεριλαμβανομένων των σημειώσεων και των εικόνων</string>
    <string name="donate">Δωρεά</string>
    <string name="icon_header_click_text">Πατήστε παρατεταμένα για επεξεργασία του εικονιδίου</string>
-    <string name="openFrontImageInGalleryApp">Ανοίξτε την εμπρόσθια εικόνα στη συλλογή εικόνων</string>
    <string name="storageReadPermissionRequired">Δικαίωμα ανάγνωσης του χώρου αποθήκευσης απαραίτητο για αυτήν την ενέργεια…</string>
    <string name="validFromDate">Ισχύει από</string>
    <string name="anyDate">Οποιαδήποτε ημερομηνία</string>
@@ -305,4 +293,14 @@
    <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>
+    <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>
+    <string name="nfc_block_system_error">Αποτυχία παύσης NFC</string>
 </resources>
@@ -101,7 +101,6 @@
    <string name="balance">Saldo</string>
    <string name="moveBarcodeToTopOfScreen">Movi la strekodon al la supro de la ekrano</string>
    <string name="errorReadingImage">Ne eblis legi bildon</string>
-    <string name="settings_brown_theme">Bruna</string>
    <string name="showMoreInfo">Montri informojn</string>
    <string name="on_github">sur GitHub</string>
    <string name="archive">Enarkivigi</string>
@@ -127,7 +126,6 @@
    <string name="validFromDate">Valida ekde</string>
    <string name="accept">Akcepti</string>
    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="settings_sky_blue_theme">Ĉielblua</string>
    <string name="unarchive">Elarkivigi</string>
    <string name="switchToBarcode">Ŝanĝi al strikodo</string>
    <string name="currentBalanceSentence">Nuna saldo: <xliff:g>%s</xliff:g></string>
@@ -166,9 +164,7 @@
    <string name="balanceParsingFailed">Nevalida saldo</string>
    <string name="chooseImportType">Importi datumojn de</string>
    <string name="importCatima">Importi el Catima</string>
-    <string name="settings_green_theme">Verda</string>
    <string name="updateBalance">Ĝisdatigi saldon</string>
-    <string name="barcodeLongPressMessage">Nur bildoj povas esti malfermitaj en la galeria apo</string>
    <string name="sort_by_name">Nomo</string>
    <string name="sort_by_most_recently_used">Plej laste uzitaj</string>
    <string name="sort_by_expiry">Dato de eksvalidiĝo</string>
@@ -183,8 +179,6 @@
    <string name="newBalanceSentence">Nova saldo: <xliff:g>%s</xliff:g></string>
    <string name="anyDate">Iam ajn</string>
    <string name="switchToFrontImage">Ŝanĝi al antaŭa bildo</string>
-    <string name="openFrontImageInGalleryApp">Malfermi la antaŭan bildon en galeria apo</string>
-    <string name="openBackImageInGalleryApp">Malfermi la malantaŭan bildon en galeria apo</string>
    <string name="show_name_below_image_thumbnail">Montri nomon sub la bildeto</string>
    <string name="show_note">Montri noton</string>
    <string name="settings_category_title_cards">Kartoj</string>
@@ -225,8 +219,6 @@
    <string name="settings_oled_dark_summary">Malpligrandigas baterian uzadon sur OLED-ekranoj</string>
    <string name="selectColor">Elekti koloron</string>
    <string name="setIcon">Starigi bildeton</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Rozkolora</string>
    <string name="field_must_not_be_empty">Kampo devas ne esti malplena</string>
    <string name="manually_enter_barcode_instructions">Entajpu la identigilon aŭ tekston sur via karto kaj premu la strikodon kiu aspektas kiel tiu sur via karto.</string>
    <string name="turn_flashlight_off">Malŝalti poŝlampon</string>
@@ -241,7 +233,6 @@
    <string name="wrongValueForBarcodeType">La valoro ne validas por la elektita tipo de strikodo</string>
    <string name="importCancelled">Importado nuligita</string>
    <string name="exportCancelled">Eksportado nuligita</string>
-    <string name="settings_theme_color">Koloro de la temo</string>
    <string name="app_libraries">Liberaj triaj bibliotekoj: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="addFromPdfFile">Elekti PDF-dosieron</string>
    <string name="failedLaunchingFileManager">Subtenata dosiermastrumilo ne trovebla</string>
@@ -267,9 +258,6 @@
    <string name="importVoucherVault">Importi el Voucher Vault</string>
    <string name="turn_flashlight_on">Enŝalti poŝlampon</string>
    <string name="settings_locale">Lingvo</string>
-    <string name="settings_magenta_theme">Maĝenta</string>
-    <string name="settings_violet_theme">Viola</string>
-    <string name="settings_blue_theme">Blua</string>
    <string name="enter_card_id">Entajpu la identigilon aŭ tekston sur via karto</string>
    <string name="card_id_must_not_be_empty">Identigilo devas ne esti malplena</string>
    <string name="add_a_card_in_a_different_way">Aldoni karton alimaniere</string>
@@ -51,7 +51,7 @@
        <item quantity="many">Borrar estas <xliff:g>%d</xliff:g> tarjetas de forma permanente\?</item>
        <item quantity="other"/>
    </plurals>
-    <string name="failedOpeningFileManager">Primero instale un administrador de archivos.</string>
+    <string name="failedOpeningFileManager">No se pudo abrir el explorador de archivos</string>
    <string name="intent_import_card_from_url_share_multiple_text">Quiero compartirte algunas tarjetas</string>
    <string name="points">Puntos</string>
    <string name="balanceParsingFailed">Balance inválido</string>
@@ -169,11 +169,7 @@
    <string name="updateBarcodeQuestionText">Has cambiado el ID. ¿Quieres actualizar también el código de barras para usar el mismo valor?</string>
    <string name="settings_locale">Idioma</string>
    <string name="settings_system_locale">Sistema</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Rosa</string>
    <string name="exportPassword">Configura una contraseña para proteger tu exportación (opcional)</string>
-    <string name="settings_sky_blue_theme">Celeste</string>
-    <string name="settings_green_theme">Verde</string>
    <string name="exportPasswordHint">Ingresar contraseña</string>
    <string name="setIcon">Establecer miniatura</string>
    <string name="showMoreInfo">Mostrar información</string>
@@ -184,14 +180,8 @@
    <string name="settings_oled_dark_summary">Reduce uso de batería en pantallas OLED</string>
    <string name="settings_oled_dark">Fondo negro puro para tema oscuro</string>
    <string name="selectColor">Seleccionar color</string>
-    <string name="settings_theme_color">Color del tema</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_violet_theme">Violeta</string>
-    <string name="settings_brown_theme">Marrón</string>
    <string name="sort">Ordenar</string>
-    <string name="settings_blue_theme">Azul</string>
    <string name="app_contributors">Hecho posible por: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="barcodeLongPressMessage">Solo se puede abrir imágenes en la aplicación de galería</string>
    <string name="yes">Si</string>
    <string name="no">No</string>
    <string name="passwordRequired">Ingresa la contraseña</string>
@@ -201,9 +191,74 @@
    <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>
    <string name="cardWithNumber">Tarjeta <xliff:g>%d</xliff:g></string>
+    <string name="version_history">Historial de versiones</string>
+    <string name="credits">Créditos</string>
+    <string name="help_translate_this_app">Ayúdanos a traducir esta app</string>
+    <string name="license">Licencia</string>
+    <string name="on_github">en GitHub</string>
+    <string name="rate_this_app">Califica esta app</string>
+    <string name="on_google_play">en Google Play</string>
+    <string name="report_error">Reportar error</string>
+    <string name="translate_platform">en Weblate</string>
+    <string name="shortcutSelectCard">Selecciona una tarjeta</string>
+    <string name="options">Opciones</string>
+    <string name="duplicateCard">Duplicar</string>
+    <string name="archive">Archivo</string>
+    <string name="archived">Tarjeta archivada</string>
+    <string name="failedLaunchingPhotoPicker">No se pudo encontrar un selector de imagen soportado</string>
+    <string name="previousCard">Anterior</string>
+    <string name="nextCard">Siguiente</string>
+    <string name="failedToOpenUrl">Primero instala un navegador web</string>
+    <string name="welcome">Bienvenido/a a Catima</string>
+    <string name="importCards">Importar tarjetas</string>
+    <string name="updateBalanceHint">Ingrese monto</string>
+    <string name="validFromDate">Valido desde</string>
+    <string name="height">Altura</string>
+    <string name="donate">Donar</string>
+    <string name="icon_header_click_text">Manten presionado para editar la miniatura</string>
+    <string name="show_note">Mostrar nota</string>
+    <string name="back">Atrás</string>
+    <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="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>
+    <string name="settings_disable_nfc_while_viewing_card">Pause NFC</string>
 </resources>
@@ -10,13 +10,13 @@
    <string name="edit">Editar</string>
    <string name="delete">Eliminar</string>
    <string name="confirm">Confirmar</string>
-    <string name="ok">De acuerdo</string>
+    <string name="ok">Aceptar</string>
    <string name="sendLabel">Enviar…</string>
    <string name="editCardTitle">Editar tarjeta</string>
    <string name="addCardTitle">Añadir tarjeta</string>
    <string name="scanCardBarcode">Escanear código de barras</string>
    <string name="cardShortcut">Atajo de tarjeta</string>
-    <string name="noCardsMessage">Añada una tarjeta primero</string>
+    <string name="noCardsMessage">Añada una primera tarjeta</string>
    <string name="noCardExistsError">No se ha podido encontrar esa tarjeta</string>
    <string name="importExport">Importar/Exportar</string>
    <string name="exportName">Exportar</string>
@@ -25,7 +25,7 @@
    <string name="importFailedTitle">Falló la importación</string>
    <string name="importFailed">No se ha podido realizar la importación</string>
    <string name="exportSuccessfulTitle">Exportado</string>
-    <string name="exportFailedTitle">Falló la exportación</string>
+    <string name="exportFailedTitle">Exportación incorrecta</string>
    <string name="exportFailed">No se han podido exportar</string>
    <string name="importing">Importando…</string>
    <string name="exporting">Exportando…</string>
@@ -47,7 +47,7 @@
    <string name="settings_theme">Tema</string>
    <string name="app_copyright_old">Basado en Loyalty Card Keychain
 \nderechos de autor © 2016-2020 de Branden Archer</string>
-    <string name="exportOptionExplanation">Los datos se guardarán en la ubicación que elija</string>
+    <string name="exportOptionExplanation">Los datos serán escritos en el lugar que elija</string>
    <string name="failedParsingImportUriError">No se pudo procesar el URI de importación</string>
    <string name="share">Compartir</string>
    <string name="barcodeType">Tipo de código de barras</string>
@@ -134,7 +134,7 @@
        <item quantity="many"><xliff:g>%d</xliff:g> seleccionadas</item>
        <item quantity="other"><xliff:g>%d</xliff:g> seleccionadas</item>
    </plurals>
-    <string name="deleteTitle">Eliminar la tarjeta</string>
+    <string name="deleteTitle">Eliminar tarjeta</string>
    <string name="deleteConfirmation">¿Quiere eliminar permanentemente esta tarjeta\?</string>
    <plurals name="deleteCardsConfirmation">
        <item quantity="one">¿Borrar esta tarjeta <xliff:g>%d</xliff:g> permanentemente\?</item>
@@ -147,15 +147,6 @@
        <item quantity="other">Borrar <xliff:g>%d</xliff:g> tarjetas</item>
    </plurals>
    <string name="app_contributors">Hecho posible por: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="settings_brown_theme">Marrón</string>
-    <string name="settings_green_theme">Verde</string>
-    <string name="settings_sky_blue_theme">Azul cielo</string>
-    <string name="settings_blue_theme">Azul</string>
-    <string name="settings_violet_theme">Violeta</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_pink_theme">Rosa</string>
-    <string name="settings_theme_color">Color del tema</string>
-    <string name="settings_catima_theme">Catima</string>
    <string name="settings_system_locale">Sistema</string>
    <string name="settings_locale">Idioma</string>
    <string name="noGroupCards">Este grupo está vacío</string>
@@ -214,13 +205,12 @@
    </plurals>
    <string name="starred">Estrellado</string>
    <string name="failedToRetrieveImageFile">No se pudo recuperar el archivo de imagen</string>
-    <string name="barcodeLongPressMessage">Solo se pueden abrir imágenes en la aplicación de galería</string>
    <string name="updateBalanceTitle">¿Cuánto has gastado o recibido?</string>
    <string name="currentBalanceSentence">Saldo actual: <xliff:g>%s</xliff:g></string>
-    <string name="noCameraPermissionDirectToSystemSetting">Para escanear códigos de barras, Catima necesitará acceso a su cámara. Toque aquí para cambiar la configuración de sus permisos.</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Para escanear códigos de barras, Catima necesitará acceso a su cámara. Toque aquí para cambiar los ajustes de su permiso.</string>
    <string name="updateBalanceHint">Introduzca el importe</string>
    <string name="newBalanceSentence">Nuevo balance: <xliff:g>%s</xliff:g></string>
-    <string name="cameraPermissionDeniedTitle">No se pudo acceder a la cámara</string>
+    <string name="cameraPermissionDeniedTitle">No pudo acceder a la cámara</string>
    <string name="updateBalance">Actualizar el balance</string>
    <string name="importCards">Importar tarjetas</string>
    <string name="storageReadPermissionRequired">Se necesita permiso para leer el almacenamiento para esta acción…</string>
@@ -231,8 +221,6 @@
    <string name="validFromSentence">Válido desde: <xliff:g>%s</xliff:g></string>
    <string name="height">Alto</string>
    <string name="switchToFrontImage">Cambiar a imagen frontal</string>
-    <string name="openFrontImageInGalleryApp">Abrir imagen frontal en la aplicación de la galería</string>
-    <string name="openBackImageInGalleryApp">Abrir imagen trasera en la aplicación de la galería</string>
    <string name="setBarcodeHeight">Ajustar la altura del código de barras</string>
    <string name="donate">Donar</string>
    <string name="switchToBarcode">Cambiar a código de barras</string>
@@ -243,7 +231,7 @@
    <string name="show_validity">Mostrar la validez</string>
    <string name="show_balance">Mostrar el saldo</string>
    <string name="permissionReadCardsLabel">Leer Tarjetas Catima</string>
-    <string name="permissionReadCardsDescription">leer tus tarjetas Catima y todos sus detalles, incluidas notas e imágenes</string>
+    <string name="permissionReadCardsDescription">lea sus tarjetas Catima y todos sus detalles, incluyendo notas e imágenes</string>
    <string name="settings_allow_content_provider_read_title">Permite a otras aplicaciones acceder a mis datos</string>
    <string name="settings_display_barcode_max_brightness_summary">Necesario para que funcione en algunos escáneres</string>
    <string name="settings_keep_screen_on_summary">Deshabilita el tiempo de espera de la pantalla mientras se ve una tarjeta</string>
@@ -268,7 +256,7 @@
    <string name="app_name">Catima</string>
    <string name="continue_">Continuar</string>
    <string name="add_manually_warning_title">Se recomienda escanear</string>
-    <string name="add_manually_warning_message">En algunas tiendas, el valor del código de barras difiere del número escrito en la tarjeta. Por este motivo, es posible que la introducción manual del código de barras no siempre funcione. Se recomienda encarecidamente escanear el código de barras con la cámara. ¿Aún desea continuar?</string>
+    <string name="add_manually_warning_message">En algunas tarjetas, el valor del código de barras difiere del número escrito en la tarjeta. Por este motivo, introducir manualmente puede que no siempre funcione. Se recomienda analizar el código de barras con su cámara en su lugar. ¿Aún desea continuar?</string>
    <string name="spend">Gastar</string>
    <string name="receive">Recibió</string>
    <string name="amountParsingFailed">Importe incorrecto</string>
@@ -311,4 +299,14 @@
    <string name="acra_crash_email_subject">Reporte del fallo <xliff:g id="app_name">%s</xliff:g></string>
    <string name="pref_enable_acra">Solicitar envío de reportes de fallos</string>
    <string name="pref_enable_acra_summary">Cuando está activado, se le pedirá que informe sobre un fallo cuando ocurra. Los informes de fallo nunca se envían automáticamente.</string>
+    <string name="copy_value">Copia valor</string>
+    <string name="copied_to_clipboard">Copiado al portapapeles</string>
+    <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>
+    <string name="nfc_block_system_error">Incorrecto al pausar NFC</string>
 </resources>
@@ -118,9 +118,6 @@
    <string name="updateBarcodeQuestionTitle">Kas uuendame triipkoodi väärtust?</string>
    <string name="yes">Jah</string>
    <string name="no">Ei</string>
-    <string name="settings_theme_color">Kujunduse värv</string>
-    <string name="settings_pink_theme">Roosa</string>
-    <string name="barcodeLongPressMessage">Galeriirakenduses saad avada vaid pilte</string>
    <string name="sort_by_most_recently_used">Viimati kasutatud</string>
    <string name="sort_by_expiry">Aegumine</string>
    <string name="reverse">…tagurpidi järjekorras</string>
@@ -201,13 +198,6 @@
    <string name="settings_system_locale">Süsteemi keel</string>
    <string name="selectColor">Vali värv</string>
    <string name="setIcon">Lisa pisipilt</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_magenta_theme">Fuksiapunane</string>
-    <string name="settings_violet_theme">Punakassinine</string>
-    <string name="settings_blue_theme">Sinine</string>
-    <string name="settings_sky_blue_theme">Taevasinine</string>
-    <string name="settings_green_theme">Roheline</string>
-    <string name="settings_brown_theme">Pruun</string>
    <string name="app_contributors">Seda rakendust on aidanud teha: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="sort">Järjesta</string>
    <string name="updateBalance">Uuenda maksejääki</string>
@@ -239,8 +229,6 @@
    <string name="switchToFrontImage">Vaata esikülje pilti</string>
    <string name="switchToBackImage">Vaata tagakülje pilti</string>
    <string name="switchToBarcode">Vaata triipkoodi</string>
-    <string name="openFrontImageInGalleryApp">Ava esikülje pilt pildivalijas</string>
-    <string name="openBackImageInGalleryApp">Ava tagakülje pilt pildivalijas</string>
    <string name="setBarcodeHeight">Määra triipkoodi kõrgus</string>
    <string name="donate">Toeta rahaliselt</string>
    <string name="icon_header_click_text">Pisipildi muutmiseks vajuta pikalt</string>
@@ -305,4 +293,14 @@
    <string name="acra_crash_email_subject">Kokkujooksmise aruanne: <xliff:g id="app_name">%s</xliff:g></string>
    <string name="pref_enable_acra">Küsi luba kokkujooksmiste aruannete saatmiseks</string>
    <string name="pref_enable_acra_summary">Kui eelistus on kasutusel, siis rakendus küsib sinult luba veateate saatmiseks. Seda ei tehta iialgi automaatselt.</string>
+    <string name="copy_value">Kopeeri väärtus</string>
+    <string name="copied_to_clipboard">Kopeeritud lõikelauale</string>
+    <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>
+    <string name="nfc_block_system_error">Lähiväljaside (NFC) peatamine ei õnnestunud</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>
@@ -36,7 +36,7 @@
    <string name="scanCardBarcode">اسکن بارکد</string>
    <string name="cardShortcut">میان‌بر کارت</string>
    <string name="noCardsMessage">ابتدا یک کارت بیافزایید</string>
-    <string name="noCardExistsError">کارت پیدا نشد</string>
+    <string name="noCardExistsError">آن کارت پیدا نشد</string>
    <string name="importFailedTitle">ایمپورت ناموفق بود</string>
    <string name="importFailed">نمیتوان ایمپورت کرد</string>
    <string name="exportSuccessfulTitle">خروجی گرفته شده</string>
@@ -68,7 +68,7 @@
    <string name="permissionReadCardsDescription">کارت های کاتیما و تمام جزئیاتشان از جمله یادداشت‌ها و عکس‌ها را بخوانید</string>
    <string name="cameraPermissionDeniedTitle">نمیتوان به دوربین دسترسی پیدا کرد</string>
    <string name="noCameraPermissionDirectToSystemSetting">برای اسکن بارکد ها، کاتیما نیاز دارد به دوربین شما دسترسی داشته باشد. اینجا بزنید تا تنظیمات دسترسی خود را تغییر دهید.</string>
-    <string name="importExport">ایمپورت/خروجی گرفتن</string>
+    <string name="importExport">واردات/صادرات</string>
    <string name="settings_category_title_privacy">حریم شخصی</string>
    <string name="settings_category_title_general">عمومی</string>
    <string name="settings_category_title_cards">نمایش کارت</string>
@@ -117,8 +117,8 @@
    <string name="importCatimaMessage">فایل <i>catima.zip</i> خروجی خود را از Catima برای وارد کردن انتخاب کنید.\nآن را از منوی وارد/صادر کردن در یک اپلیکیشن دیگر Catima با فشردن دکمه صادرکردن ابتدا ایجاد کنید.</string>
    <string name="unsupportedBarcodeType">این نوع بارکد هنوز نمی‌تواند نمایش داده شود. ممکن است در نسخه آینده برنامه پشتیبانی شود.</string>
    <plurals name="balancePoints">
-        <item quantity="one"><xliff:g>%s</xliff:g> امتیاز</item>
-        <item quantity="other"><xliff:g>%s</xliff:g> امتیاز</item>
+        <item quantity="one"><xliff:g>%s</xliff:g> نقطه</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> نقطه</item>
    </plurals>
    <string name="importFidmeMessage">فایل خروجی <i>fidme-export-request-xxxxxx.zip</i> خود را از FidMe برای وارد کردن انتخاب کنید، و سپس نوع بارکدها را به صورت دستی مشخص کنید.\nآن را از پروفایل FidMe خود با انتخاب گزینه حفاظت از داده و سپس فشار دادن گزینه استخراج داده من ابتدا ایجاد کنید.</string>
    <string name="leaveWithoutSaveTitle">خروج</string>
@@ -139,7 +139,7 @@
    <string name="group_updated">گروه به روز شد</string>
    <string name="all">همه</string>
    <string name="deleteConfirmationGroup">حذف گروه؟</string>
-    <string name="failedOpeningFileManager">ابتدا یک مدیریت فایل نصب کنید.</string>
+    <string name="failedOpeningFileManager">نمی توان مدیر پرونده را باز کرد</string>
    <string name="moveUp">به بالا حرکت کن</string>
    <string name="moveDown">به پایین حرکت کن</string>
    <string name="leaveWithoutSaveConfirmation">بدون ذخیره ترک می‌کنید؟</string>
@@ -179,8 +179,7 @@
    <string name="importCards">واردات کارت ها</string>
    <string name="height">ارتفاع</string>
    <string name="add_manually_warning_message">برای برخی از فروشگاه‌ها، مقدار بارکد با عدد نوشته شده روی کارت متفاوت است. به همین دلیل، وارد کردن دستی بارکد ممکن است همیشه کار نکند. اکیداً توصیه می‌شود که به جای آن، بارکد را با دوربین خود اسکن کنید. آیا هنوز می‌خواهید ادامه دهید؟</string>
-    <string name="generic_error_please_retry">ببخشید، مشکلی پیش آمده، لطفا دوباره امتحان کنید...</string>
-    <string name="settings_magenta_theme">سرخابی</string>
+    <string name="generic_error_please_retry">مشکلی پیش آمده</string>
    <string name="welcome">یه کتیما خوش آمدید</string>
    <string name="chooseValidFromDate">مقداری درست از تاریخ برگزینید</string>
    <string name="intent_import_card_from_url_share_multiple_text">می‌خواهم چند کارت به شما بدهم</string>
@@ -192,21 +191,14 @@
    <string name="no">نه</string>
    <string name="updateBarcodeQuestionTitle">مقدار بارکد را به‌روز می‌کنید؟</string>
    <string name="updateBarcodeQuestionText">شما شناسه را تغییر دادید. می‌خواهید بارکد را هم به‌روز کنید تا همین مقدار را به‌کار ببرید؟</string>
-    <string name="failedGeneratingShareURL">نتوانستم آدرس هم‌رسانی‌پذیر بسازم. لطفن این را گزارش کنید.</string>
+    <string name="failedGeneratingShareURL">نتوانستم نشانی هم‌رسانی‌پذیر بسازم.</string>
    <string name="turn_flashlight_on">چراغ‌قوه را روشن کنید</string>
    <string name="settings_locale">زبان</string>
    <string name="settings_oled_dark">پس‌زمینه‌ی یک‌دست سیاه برای حالت تاریک</string>
    <string name="settings_oled_dark_summary">استفاده‌ی باتری را برای نمایشگرهای OLED کاهش می‌دهد</string>
    <string name="setIcon">قالب پیش‌نمایه را بگمارید</string>
-    <string name="settings_theme_color">رنگ زمینه</string>
-    <string name="settings_catima_theme">کتیما</string>
    <string name="settings_system_locale">سیستم</string>
    <string name="selectColor">رنگ را برگزینید</string>
-    <string name="settings_violet_theme">بنفش</string>
-    <string name="settings_blue_theme">آبی</string>
-    <string name="settings_sky_blue_theme">آبی آسمانی</string>
-    <string name="settings_green_theme">سبز</string>
-    <string name="settings_brown_theme">قهوه‌ای</string>
    <string name="app_contributors">با کمک او ممکن شد: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="sort">مرتب‌کردن</string>
    <string name="showMoreInfo">نمایش اطلاعات</string>
@@ -217,12 +209,10 @@
    <string name="wrongValueForBarcodeType">مقدار برای نوع بارکد برگزیده درست نیست</string>
    <string name="setBackImage">عکس پشتِ‌سر را بگذارید</string>
    <string name="removeImage">عکس را برچینید</string>
-    <string name="passwordRequired">لطفا گذرواژه را وارد کنید</string>
+    <string name="passwordRequired">گذرواژه را وارد کنید</string>
    <string name="previousCard">پیشین</string>
    <string name="turn_flashlight_off">چراغ‌قوه را خاموش کنید</string>
-    <string name="settings_pink_theme">صورتی</string>
    <string name="updateBalance">به‌روزرسانی موجودی</string>
-    <string name="barcodeLongPressMessage">تنها عکس می‌تواند در گالری برنامه باز شود</string>
    <string name="sort_by_name">نام</string>
    <string name="sort_by_most_recently_used">به‌تازگی استفاده‌شده</string>
    <string name="sort_by_expiry">انقضا</string>
@@ -230,7 +220,6 @@
    <string name="include_if_asking_support">اگر می‌خواهید پشتیبانی درخواست کنید، اطلاعات زیر را پر کنید:</string>
    <string name="unarchive">برچیدن بایگانی</string>
    <string name="switchToBackImage">به عکس پشتِ‌سر جابه‌جا کنید</string>
-    <string name="openBackImageInGalleryApp">عکس پشتِ‌سر را در برنامه‌ی گالری باز کنید</string>
    <string name="setBarcodeHeight">ارتفاع بارگد را بگمارید</string>
    <string name="donate">کمک مالی کنید</string>
    <string name="icon_header_click_text">برای ویرایش قاب پیش‌نمایه فشار داده و نگه‌دارید</string>
@@ -244,7 +233,7 @@
    <string name="settings_column_count_4">۴</string>
    <string name="settings_column_count_5">۵</string>
    <string name="settings_column_count_6">۶</string>
-    <string name="failedLaunchingPhotoPicker">نتوانستم یک برنامه‌ی گالری پشتیبانی‌شده بیابم</string>
+    <string name="failedLaunchingPhotoPicker">نتوانستم یک برنامه‌ی انتخاب تصویر پشتیبانی‌شده بیابم</string>
    <string name="show_balance">موجودی را نشان دهید</string>
    <string name="settings_column_count_landscape">ستون‌ها در حالت لنداسکیپ</string>
    <string name="settings_column_count_1">۱</string>
@@ -274,7 +263,6 @@
    <string name="failedToOpenUrl">نخست یک مرورگر وب نصب کنید</string>
    <string name="updateBalanceTitle">چقدر خرج یا دریافت کردید؟</string>
    <string name="switchToBarcode">به بارکد جابه‌جا کنید</string>
-    <string name="openFrontImageInGalleryApp">عکس روبه‌رو را در برنامه‌ی گالری باز کنید</string>
    <string name="add_a_card_in_a_different_way">یک کارت به روشی متفاوت بیافزایید</string>
    <string name="takePhoto">عکس بگیرید</string>
    <string name="settings_column_count_7">۷</string>
@@ -294,4 +282,9 @@
    <string name="spend">خرج کردن</string>
    <string name="addFromPkpass">یک فایل دفترچه حساب (.pkpass) انتخاب کنید</string>
    <string name="noCameraFoundGuideText">به نظر نمی‌رسد دستگاه شما دوربین داشته باشد. اگر دارد، دستگاه را مجدداً راه‌اندازی کنید. در غیر این صورت، از دکمه گزینه‌های بیشتر در زیر برای افزودن بارکد به روش دیگری استفاده کنید.</string>
+    <string name="card_list_widget_empty">بعد از اینکه چند کارت وفاداری در کاتیما اضافه کردید، آنها اینجا ظاهر می‌شوند. اگر کارت دارید، مطمئن شوید که همه آنها بایگانی نشده‌اند.</string>
+    <string name="card_list_widget_name">فهرست کارت</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>
 </resources>
@@ -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,20 +139,11 @@
        <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>
-    <string name="settings_brown_theme">Ruskea</string>
-    <string name="settings_green_theme">Vihreä</string>
-    <string name="settings_sky_blue_theme">Taivaansininen</string>
-    <string name="settings_blue_theme">Siniset</string>
-    <string name="settings_violet_theme">Violetti</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_pink_theme">Pinkki</string>
-    <string name="settings_theme_color">Teeman väri</string>
-    <string name="settings_catima_theme">Catima</string>
    <string name="settings_system_locale">Järjestelmä</string>
    <string name="settings_locale">Kieli</string>
    <string name="noGroupCards">Tämä ryhmä on tyhjä</string>
@@ -182,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>
@@ -195,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>
@@ -212,7 +200,6 @@
    <string name="welcome">Tervetuloa Catimaan</string>
    <string name="updateBalanceTitle">Kuinka paljon kulutit tai tienasit?</string>
    <string name="updateBalanceHint">Syötä summa</string>
-    <string name="barcodeLongPressMessage">Vain kuvia on mahdollista avata galleriasovelluksessa</string>
    <string name="archive">Arkistoi</string>
    <string name="importCards">Tuo kortteja</string>
    <string name="failedToRetrieveImageFile">Kuvatiedoston noutaminen epäonnistui</string>
@@ -235,14 +222,12 @@
    <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="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="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>
@@ -293,12 +278,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>
@@ -15,4 +15,16 @@
        <item quantity="one"><xliff:g>%d</xliff:g> napili</item>
        <item quantity="other"><xliff:g>%d</xliff:g> ang napili</item>
    </plurals>
+    <string name="star">Sa card viewing, ang text ay naka-display lamang tuwing naka-long press ang star icon</string>
+    <string name="cancel">I-kansela</string>
+    <string name="save">I-save</string>
+    <string name="edit">I-edit</string>
+    <string name="delete">I-delete</string>
+    <string name="confirm">I-confirm</string>
+    <string name="share">I-share</string>
+    <string name="sendLabel">I-send…</string>
+    <string name="editCardTitle">I-edit ang card</string>
+    <string name="noCardsMessage">Mag-add ng card muna</string>
+    <string name="noCardExistsError">Hindi mahanap ang card</string>
+    <string name="exportName">I-export</string>
 </resources>
@@ -147,15 +147,6 @@
    </plurals>
    <string name="settings_system_locale">Système</string>
    <string name="settings_locale">Langue</string>
-    <string name="settings_brown_theme">Marron</string>
-    <string name="settings_green_theme">Vert</string>
-    <string name="settings_sky_blue_theme">Bleu ciel</string>
-    <string name="settings_blue_theme">Bleu</string>
-    <string name="settings_violet_theme">Violet</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_pink_theme">Rose</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Couleur du thème</string>
    <string name="app_contributors">Rendu possible par : <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="noGroupCards">Ce groupe est vide</string>
    <string name="barcodeImageDescriptionWithType">Image <xliff:g>%s</xliff:g> code-barres</string>
@@ -212,7 +203,6 @@
    <string name="previousCard">Précédent</string>
    <string name="failedToOpenUrl">Installez d\'abord un navigateur web</string>
    <string name="welcome">Bienvenue dans Catima</string>
-    <string name="barcodeLongPressMessage">Seules les images peuvent être ouvertes dans l’application galerie</string>
    <string name="failedToRetrieveImageFile">Impossible de récupérer le fichier image</string>
    <string name="currentBalanceSentence">Solde actuel : <xliff:g>%s</xliff:g></string>
    <string name="updateBalanceHint">Entrez le montant</string>
@@ -232,8 +222,6 @@
    <string name="switchToFrontImage">Passer à l\'image avant</string>
    <string name="switchToBackImage">Passer à l\'image arrière</string>
    <string name="switchToBarcode">Passer au code barre</string>
-    <string name="openFrontImageInGalleryApp">Ouvrir l\'image du recto dans l\'application de visualisation des images</string>
-    <string name="openBackImageInGalleryApp">Ouvrir l\'image du verso dans l\'application de visualisation des images</string>
    <string name="setBarcodeHeight">Définir la hauteur du code-barres</string>
    <string name="donate">Faire un don</string>
    <string name="icon_header_click_text">Appuyez longuement pour modifier la vignette</string>
@@ -311,4 +299,14 @@
    <string name="acra_crash_email_subject">Rapport de plantage de <xliff:g id="app_name">%s</xliff:g></string>
    <string name="pref_enable_acra">Demander pour envoyer des rapports de plantage</string>
    <string name="pref_enable_acra_summary">Quand activé, il vous sera demandé d\'envoyer un rapport de plantage en cas de plantage. Les rapports de plantage ne sont jamais envoyés automatiquement.</string>
+    <string name="copy_value">Copier la valeur</string>
+    <string name="copied_to_clipboard">Copié dans le presse-papier</string>
+    <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>
+    <string name="nfc_block_system_error">Erreur lors de la mise en pause du NFC</string>
 </resources>
@@ -145,20 +145,11 @@
    <string name="settings_oled_dark_summary">Diminúe o uso da batería nas pantallas OLED</string>
    <string name="settings_system_locale">Sistema</string>
    <string name="selectColor">Elixir cor</string>
-    <string name="settings_theme_color">Cor do decorado</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Rosa</string>
-    <string name="settings_magenta_theme">Maxenta</string>
-    <string name="settings_violet_theme">Violeta</string>
-    <string name="settings_sky_blue_theme">Azul celeste</string>
-    <string name="settings_green_theme">Verde</string>
-    <string name="settings_brown_theme">Marrón</string>
    <string name="app_contributors">Creada grazas a: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="sort">Orde</string>
    <string name="showMoreInfo">Ver info</string>
    <string name="updateBalance">Actualizar saldo</string>
    <string name="failedToRetrieveImageFile">Fallou a obtención do ficheiro de imaxe</string>
-    <string name="barcodeLongPressMessage">Só imaxes que se abren na app de galería</string>
    <string name="sort_by_name">Nome</string>
    <string name="sort_by_most_recently_used">Usadas recentemente</string>
    <string name="sort_by_expiry">Caducidade</string>
@@ -202,8 +193,6 @@
    <string name="height">Altura</string>
    <string name="switchToFrontImage">Cambiar á imaxe frontal</string>
    <string name="switchToBackImage">Cambiar á imaxe posterior</string>
-    <string name="openFrontImageInGalleryApp">Abrir imaxe frontal no visor de imaxes</string>
-    <string name="openBackImageInGalleryApp">Abrir imaxe posterior no visor de imaxes</string>
    <string name="setBarcodeHeight">Establecer altura do código de barras</string>
    <string name="icon_header_click_text">Pulsación longa para editar a miniatura</string>
    <string name="show_name_below_image_thumbnail">Mostrar nome debaixo da miniatura</string>
@@ -269,7 +258,6 @@
    <string name="deleteConfirmationGroup">Eliminar grupo?</string>
    <string name="failedOpeningFileManager">Non puido abrir un xestor de ficheiros</string>
    <string name="settings_locale">Idioma</string>
-    <string name="settings_blue_theme">Azul</string>
    <string name="passwordRequired">Escribe o contrasinal</string>
    <string name="exportPassword">Establece un contrasinal para protexer a exportación (optativo)</string>
    <string name="exportPasswordHint">Escribe o contrasinal</string>
@@ -304,4 +292,14 @@
    <string name="acra_crash_email_subject">Informe do fallo de <xliff:g id="app_name">%s</xliff:g></string>
    <string name="pref_enable_acra">Solicitar informar sobre os fallos</string>
    <string name="pref_enable_acra_summary">Se está activo, váiseche pedir informar sobre os fallos cando acontezan. Os informes nunca se envían automaticamente.</string>
+    <string name="copy_value">Copiar valor</string>
+    <string name="copied_to_clipboard">Copiado ao portapapeis</string>
+    <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>
+    <string name="nfc_block_system_error">Non se detivo NFC</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>
@@ -170,28 +170,19 @@
    <string name="action_more_options">अधिक विकल्प</string>
    <string name="frontImageDescription">सामने की छवि</string>
    <string name="anyDate">कोई दिन</string>
-    <string name="settings_green_theme">हरा</string>
-    <string name="settings_pink_theme">गुलाबी</string>
    <string name="action_display_options">प्रदर्शन विकल्प</string>
    <string name="settings_category_title_cards">कार्ड</string>
    <string name="addWithoutBarcode">बिना बारकोड वाला कार्ड जोड़ें</string>
    <string name="on_google_play">गूगल प्ले पर</string>
    <string name="report_error">गलती की रिपोर्ट करें</string>
    <string name="passwordRequired">कृपया पासवर्ड दर्ज करें</string>
-    <string name="settings_brown_theme">भूरा</string>
    <string name="field_must_not_be_empty">फ़ील्ड खाली नहीं होनी चाहिए</string>
-    <string name="settings_catima_theme">कैटिमा</string>
    <string name="options">विकल्प</string>
-    <string name="settings_magenta_theme">मैजेंटा</string>
    <string name="failedGeneratingShareURL">साझा करने योग्य URL जनरेट नहीं किया जा सकता. कृपया इसकी रिपोर्ट करें</string>
    <string name="sort_by_most_recently_used">सबसे हाल ही में उपयोग किया गया</string>
-    <string name="settings_theme_color">थीम का रंग</string>
-    <string name="settings_sky_blue_theme">आसमानी नीला (हल्का नीला)</string>
    <string name="updateBalanceHint">राशि डालें</string>
    <string name="on_github">गिटहब पर</string>
    <string name="donate">दान करें /भेंट दें</string>
-    <string name="settings_violet_theme">बैंगनी</string>
-    <string name="settings_blue_theme">नीला</string>
    <string name="shortcutSelectCard">एक कार्ड चुनें</string>
    <string name="settings_category_title_privacy">गोपनीयता</string>
    <string name="show_balance">शेष राशि दिखाएं</string>
@@ -221,7 +212,6 @@
    <string name="version_history">वर्जन तिहास</string>
    <string name="archive">पुरालेख/संग्रहित (Archive)</string>
    <string name="archived">कार्ड संग्रहीत (Archived)</string>
-    <string name="barcodeLongPressMessage">गैलरी ऐप में केवल छवियां ही खोली जा सकती हैं</string>
    <string name="license">अनुज्ञप्ति (लाइसेंस)</string>
    <string name="source_repository">स्रोत रिपोजिटरी</string>
    <string name="include_if_asking_support">यदि आप सहायता का अनुरोध करना चाहते हैं, तो निम्नलिखित जानकारी शामिल करें:</string>
@@ -254,8 +244,6 @@
    <string name="switchToFrontImage">सामने वाली छवि पर स्विच करें</string>
    <string name="switchToBackImage">पिछली छवि पर स्विच करें</string>
    <string name="switchToBarcode">बारकोड पर स्विच करें</string>
-    <string name="openFrontImageInGalleryApp">इमेज दर्शक सामने वाली इमेज खोलें</string>
-    <string name="openBackImageInGalleryApp">पिछली इमेज खोलें</string>
    <string name="setBarcodeHeight">बारकोड ऊंचाई सेट करें</string>
    <string name="icon_header_click_text">छोटी छवि (थंबनेल) संपादित करने के लिए देर तक दबाएँ</string>
    <string name="enter_card_id">अपने कार्ड पर आईडी नंबर या टेक्स्ट दर्ज करें</string>
@@ -298,4 +286,15 @@
    <string name="card_list_widget_empty">कैटिमा में कुछ लॉयल्टी कार्ड जोड़ने के बाद, वे यहाँ दिखाई देंगे। अगर आपके पास कार्ड हैं, तो सुनिश्चित करें कि वे सभी संग्रहित न हों।</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>
+    <string name="acra_explain_crash">यदि संभव हो तो कृपया यहां आप क्या कर रहे थे, इसके बारे में अधिक विवरण जोड़ें:</string>
+    <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>
@@ -88,8 +88,6 @@
    <string name="importCards">Uvezi kartice</string>
    <string name="selectColor">Odaberi boju</string>
    <string name="setIcon">Postavi sličicu</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_green_theme">Zelena</string>
    <string name="sort_by_expiry">Istek</string>
    <string name="barcodeImageDescriptionWithType">Slika vrste crtičnog koda <xliff:g>%s</xliff:g></string>
    <string name="importLoyaltyCardKeychain">Uvezi iz Loyalty Card Keychain</string>
@@ -99,9 +97,6 @@
    <string name="failedGeneratingShareURL">Nije bilo moguće generirati URL za dijeljenje</string>
    <string name="turn_flashlight_off">Isključi bljeskalicu</string>
    <string name="settings_locale">Jezik</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_violet_theme">Ljubičasta</string>
-    <string name="settings_sky_blue_theme">Nebesko plava</string>
    <string name="sort">Razvrstaj</string>
    <string name="updateBalance">Aktualiziraj saldo</string>
    <string name="sort_by">Razvrstaj po</string>
@@ -133,8 +128,6 @@
    <string name="switchToFrontImage">Prebaci na prednju sliku</string>
    <string name="switchToBackImage">Prebaci na stražnju sliku</string>
    <string name="switchToBarcode">Prebaci na crtični kod</string>
-    <string name="openFrontImageInGalleryApp">Otvori prednju sliku u aplikaciji prikazivača slika</string>
-    <string name="openBackImageInGalleryApp">Otvori stražnju sliku u aplikaciji prikazivača slika</string>
    <string name="setBarcodeHeight">Postavi visinu crtičnog koda</string>
    <plurals name="selectedCardCount">
        <item quantity="one"><xliff:g>%d</xliff:g> odabrana</item>
@@ -162,11 +155,8 @@
    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
    <string name="importFidmeMessage">Odaberi tvoj izvoz iz FidMe za uvoz i ručno odaberi vste crtičnog koda nakon toga. \nStvori ga putem tvog FidMe profila biranjem „Zaštita podataka” a zatim pritisni „Dekomprimiraj moje podatke”.</string>
    <string name="importVoucherVaultMessage">Odaberi tvoj izvoz iz Voucher Vault za uvoz. \nStvori ga u aplikaciji Voucher Vault pritiskom na „Izvoz”.</string>
-    <string name="settings_pink_theme">Ružičasta</string>
-    <string name="settings_blue_theme">Plava</string>
    <string name="failedToRetrieveImageFile">Neuspjelo dohvaćanje slikovne datoteke</string>
    <string name="license">Licenca</string>
-    <string name="barcodeLongPressMessage">U aplikaciji galerije se mogu otvoriiti samo slike</string>
    <string name="source_repository">Izvorni repozitorij</string>
    <string name="on_github">na GitHubu</string>
    <string name="on_google_play">na stranici Google Play</string>
@@ -223,8 +213,6 @@
    <string name="passwordRequired">Upiši lozinku</string>
    <string name="exportPassword">Postavi lozinku za zaštitu tvog izvoza (opcionalno)</string>
    <string name="settings_oled_dark">Potpuno crna pozadina za tamnu temu</string>
-    <string name="settings_theme_color">Boja teme</string>
-    <string name="settings_brown_theme">Smeđa</string>
    <string name="app_contributors">Doprinositelji: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="showMoreInfo">Prikaži informacije</string>
    <string name="sort_by_name">Ime</string>
@@ -311,4 +299,13 @@
    <string name="acra_crash_email_subject">Izvještaj o prekidu rada aplikacije <xliff:g id="app_name">%s</xliff:g></string>
    <string name="pref_enable_acra">Pitaj da li poslati izvještaj o prekidu rada aplikacije</string>
    <string name="pref_enable_acra_summary">Kada je uključeno, zamolit ćemo te da prijaviš prekid rada aplikacije kada se dogodi. Izvještaji o prekidu rada se nikada ne šalju automatski.</string>
+    <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="cardShortcut">Kártya parancsikon</string>
+    <string name="scanCardBarcode">Vonalkód beolvasása</string>
+    <string name="cardShortcut">Kártya indítóikon</string>
    <string name="failedParsingImportUriError">Az importálási URI nem értelmezhető</string>
    <string name="importExport">Importálás/exportálás</string>
    <string name="exportName">Exportálás</string>
-    <string name="importExportHelp">Az adatok mentése lehetővé teszi, hogy egy másik eszközre helyezze át.</string>
+    <string name="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,17 +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">Ez a 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="settings_green_theme">Zöld</string>
+    <string name="wrongValueForBarcodeType">Ez az érték nem felel meg 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="settings_catima_theme">Catima</string>
    <string name="exportPasswordHint">Kód beírása</string>
-    <string name="failedGeneratingShareURL">Nem lehetett megosztható webcímet előállítani. Kérjük, ezt jelentse.</string>
-    <string name="settings_theme_color">Téma színe</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>
@@ -71,13 +68,13 @@
    <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>
    <string name="about_title_fmt">A <xliff:g id="app_name">%s</xliff:g> névjegye</string>
    <string name="debug_version_fmt">Verzió: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_resources">Szabad külső erőforrások: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_resources">Külső erőforrások: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="selectBarcodeTitle">Vonalkód kiválasztása</string>
    <string name="starImage">Kedvencek csillag</string>
    <string name="settings">Beállítások</string>
@@ -94,14 +91,14 @@
    <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">Nem sikerült a fájlkezelő megnyitása</string>
    <string name="moveUp">Mozgatás felfelé</string>
    <string name="moveDown">Mozgatás lefelé</string>
    <string name="leaveWithoutSaveTitle">Kilépés</string>
    <string name="leaveWithoutSaveConfirmation">Kilépés mentés nélkül\?</string>
    <string name="addManually">A vonalkód kézi beírása</string>
    <string name="addFromImage">Kép kiválasztása a galériából</string>
-    <string name="editGroup">Csoportok szerkesztése: <xliff:g>%s</xliff:g></string>
+    <string name="editGroup">Csoport szerkesztése: <xliff:g>%s</xliff:g></string>
    <string name="expiryStateSentence">Lejárat: <xliff:g>%s</xliff:g></string>
    <string name="balanceSentence">Egyenleg: <xliff:g>%s</xliff:g></string>
    <string name="card">Kártya</string>
@@ -111,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">A kép nem olvasható</string>
    <string name="balance">Egyenleg</string>
    <string name="currency">Pénznem</string>
    <string name="points">Pontok</string>
@@ -121,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. \nA Loyalty Card Keychain Importálás/Exportálás menüjéből hozhatja létre, az Exportálásra koppintva.</string>
+    <string name="importVoucherVaultMessage">Jelölje ki az importálandó Voucher Vault exportot. \nA Voucher Vault-on belül az Exportálás gombra koppintva hozhatja létre.</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>
@@ -146,12 +141,6 @@
    <string name="settings_system_locale">Rendszer</string>
    <string name="selectColor">Szín kiválasztása</string>
    <string name="setIcon">Miniatűr beállítása</string>
-    <string name="settings_pink_theme">Rózsaszín</string>
-    <string name="settings_magenta_theme">Bíbor</string>
-    <string name="settings_violet_theme">Ibolya</string>
-    <string name="settings_blue_theme">Kék</string>
-    <string name="settings_sky_blue_theme">Égszínkék</string>
-    <string name="settings_brown_theme">Barna</string>
    <string name="app_contributors">Lehetővé tették: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="showMoreInfo">Információk megjelenítése</string>
    <string name="reverse">…fordított sorrendben</string>
@@ -176,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="app_libraries">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. \nAz Importálás/exportálás menüelemmel 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ípusát. \nA FidMe profiljából tudja létrehozni, az Adatvédelem, majd a Saját adatok kinyerése lehetőséggel.</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>
@@ -215,7 +202,6 @@
    <string name="newBalanceSentence">Új egyenleg: <xliff:g>%s</xliff:g></string>
    <string name="cameraPermissionDeniedTitle">Nem sikerült hozzáférni a kamerához</string>
    <string name="failedToRetrieveImageFile">Nem sikerült lekérni a képfájlt</string>
-    <string name="barcodeLongPressMessage">Csak képek nyithatók meg a galéria alkalmazásban</string>
    <string name="unarchived">Kártya archiválása megszüntetve</string>
    <string name="welcome">Üdvözöljük a Catimában</string>
    <string name="updateBalance">Egyenleg frissítése</string>
@@ -231,13 +217,11 @@
    <string name="switchToBackImage">Hátulnézeti képre váltás</string>
    <string name="switchToBarcode">Vonalkódra váltás</string>
    <string name="donate">Adományozás</string>
-    <string name="openBackImageInGalleryApp">Hátulnézeti kép megnyitása a galéria alkalmazásban</string>
-    <string name="openFrontImageInGalleryApp">Elölnézeti kép megnyitása a galéria alkalmazásban</string>
    <string name="setBarcodeHeight">Vonalkód magasságának megadása</string>
    <string name="icon_header_click_text">Hosszan nyomja meg a miniatűr szerkesztéséhez</string>
    <string name="show_note">Megjegyzés megjelenítése</string>
    <string name="show_balance">Egyenleg megjelenítése</string>
-    <string name="permissionReadCardsLabel">Catima kártyák olvasása</string>
+    <string name="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>
@@ -266,7 +250,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">Az egyes kártyákon levő számsor különbözik a vonalkód számától. Emiatt a kézi számbeírás nem minden esetben fog működni. Ajánlott tehát a vonalkód kamerával történő beolvasása. Biztos, hogy folytatja?</string>
    <string name="continue_">Tovább</string>
    <string name="spend">Költött</string>
    <string name="receive">Megkapott</string>
@@ -291,12 +275,32 @@
    <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ódszélesség beállítása</string>
+    <string name="settings_disable_nfc_while_viewing_card">NFC szüneteltetése</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Az NFC szüneteltetése a kártya megtekintése idejére, hogy ne indítsa be az NFC-s fizetést</string>
+    <string name="card_list_widget_name">Kártyalista</string>
+    <string name="card_list_widget_empty">Miután hozzáadja a kártyákat a Catimához, itt fognak megjelenni. Ha vannak kártyái, győződjön meg arról, 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">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 a hiba megoldásában azzal, hogy küld nekünk egy jelentést.</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">Rákérdezés az összeomlási jelentések elküldésére</string>
+    <string name="pref_enable_acra_summary">Ha be van kapcsolva, akkor mindig rákérdez az összeomlási jelentés elküldésére. 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ása</string>
+    <string name="back">Vissza</string>
+    <string name="nfc_blocked_while_viewing_card">NFC szüneteltetve</string>
+    <string name="change_settings">Beállítások változtatása</string>
+    <string name="nfc_block_system_error">Nem sikerült szüneteltetni az NFC-t</string>
 </resources>
@@ -19,7 +19,7 @@
    <string name="license">Lisensi</string>
    <string name="settings">Pengaturan</string>
    <string name="settings_system_theme">Sistem</string>
-    <string name="selectBarcodeTitle">Pilih Barcode</string>
+    <string name="selectBarcodeTitle">Pilih barcode</string>
    <string name="deleteConfirmation">Hapus kartu ini secara permanen?</string>
    <string name="ok">OK</string>
    <string name="share">Bagikan</string>
@@ -27,7 +27,7 @@
    <string name="addCardTitle">Tambah Kartu</string>
    <string name="scanCardBarcode">Pindai Barcode</string>
    <string name="cancel">Batalkan</string>
-    <string name="importExport">Impor/Ekspor</string>
+    <string name="importExport">Impor/ekspor</string>
    <string name="settings_theme">Tema</string>
    <string name="all">Semua</string>
    <string name="leaveWithoutSaveTitle">Keluar</string>
@@ -46,19 +46,10 @@
    <string name="setBarcodeId">Tentukan nilai barcode</string>
    <string name="photos">Foto</string>
    <string name="setFrontImage">Atur gambar bagian depan</string>
-    <string name="report_error">Lapor Kesalahan</string>
+    <string name="report_error">Laporkan kesalahan</string>
    <string name="rate_this_app">Beri nilai pada aplikasi ini</string>
    <string name="sort_by_expiry">Masa berlaku</string>
-    <string name="sort_by_most_recently_used">Paling banyak digunakan</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Merah Muda</string>
-    <string name="settings_blue_theme">Biru</string>
-    <string name="settings_green_theme">Hijau</string>
-    <string name="settings_sky_blue_theme">Biru Langit</string>
-    <string name="settings_brown_theme">Cokelat</string>
-    <string name="settings_violet_theme">Ungu</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_theme_color">Warna tema</string>
+    <string name="sort_by_most_recently_used">Yang paling baru digunakan</string>
    <string name="settings_system_locale">Sistem</string>
    <string name="settings_locale">Bahasa</string>
    <string name="turn_flashlight_on">Hidupkan lampu flash</string>
@@ -87,9 +78,9 @@
    <string name="exportFailed">Tidak dapat mengekspor</string>
    <string name="importing">Sedang mengimpor…</string>
    <string name="exporting">Sedang mengekspor…</string>
-    <string name="exportOptionExplanation">Data akan ditulis ke lokasi pilihan Anda.</string>
+    <string name="exportOptionExplanation">Data akan ditulis ke lokasi yang Anda pilih</string>
    <string name="importOptionFilesystemTitle">Impor dari pengelola file bawaan</string>
-    <string name="importOptionFilesystemExplanation">Pilih file dari pengelola file bawaan.</string>
+    <string name="importOptionFilesystemExplanation">Pilih berkas tertentu dari sistem berkas</string>
    <string name="importOptionFilesystemButton">Dari pengelola file bawaan</string>
    <string name="about">Tentang</string>
    <string name="app_copyright_fmt">Hak Cipta © 2019–<xliff:g>%d</xliff:g> Sylvia van Os dan para kontributor</string>
@@ -98,8 +89,8 @@
    <string name="app_license">Perangkat lunak bebas copyleft, berlisensi GPLv3+</string>
    <string name="about_title_fmt">Tentang <xliff:g id="app_name">%s</xliff:g></string>
    <string name="debug_version_fmt">Versi: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_libraries">Pustaka pihak ketiga gratis: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources">Sumber daya pihak ketiga gratis: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Perpustakaan pihak ketiga: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Sumber daya pihak ketiga: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="thumbnailDescription">Gambar tampilan</string>
    <string name="starImage">Favorit</string>
    <string name="settings_light_theme">Terang</string>
@@ -112,10 +103,10 @@
    <string name="exportSuccessful">Data terekspor</string>
    <string name="enter_group_name">Masukan nama grup</string>
    <string name="groups">Grup</string>
-    <string name="noGroups">Klik pada tombol tambah + untuk menambahkan grup untuk pengkategorian.</string>
+    <string name="noGroups">Klik tombol + untuk menambahkan grup untuk pengelompokan</string>
    <string name="noGroupCards">Grup ini kosong</string>
    <string name="deleteConfirmationGroup">Hapus grup?</string>
-    <string name="failedOpeningFileManager">Pasang aplikasi pengelola berkas terlebih dahulu.</string>
+    <string name="failedOpeningFileManager">Gagal membuka pengelola berkas</string>
    <string name="moveUp">Pindah ke atas</string>
    <string name="moveDown">Pindah ke bawah</string>
    <string name="leaveWithoutSaveConfirmation">Keluar tanpa menyimpan?</string>
@@ -132,36 +123,32 @@
    <string name="points">Poin</string>
    <string name="app_loyalty_card_keychain">Gantungan kunci kartu kesetiaan</string>
    <string name="privacy_policy">Kebijakan Privasi</string>
-    <string name="importCatimaMessage">Pilih ekspor <i>catima.zip</i> Anda dari Catima untuk diimpor.
-\nBuat dari menu Impor/Ekspor aplikasi Catima lain dengan menekan Ekspor di sana terlebih dahulu.</string>
-    <string name="importFidmeMessage">Pilih ekspor <i>fidme-export-request-xxxxxx.zip</i> Anda dari FidMe untuk diimpor, dan pilih jenis barcode secara manual setelahnya.
-\nBuat dari profil FidMe Anda dengan memilih Perlindungan Data lalu tekan Ekstrak data saya terlebih dahulu.</string>
+    <string name="importCatimaMessage">Pilih ekspor Anda dari Catima untuk diimpor.\nBuatlah dari menu Impor/Ekspor aplikasi Catima lainnya dengan menekan Ekspor.</string>
+    <string name="importFidmeMessage">Pilih ekspor Anda dari FidMe untuk diimpor, lalu pilih jenis barcode secara manual setelahnya.\nBuatlah dari profil FidMe Anda dengan memilih Data Protection, lalu tekan Extract my data.</string>
    <string name="importLoyaltyCardKeychain">Impor dari Loyalty Card Keychain</string>
-    <string name="importLoyaltyCardKeychainMessage">Pilih ekspor <i>LoyaltyCardKeychain.csv</i> Anda dari Loyalty Card Keychain untuk diimpor.
-\nBuat dari menu Import/Export di Loyalty Card Keychain dengan menekan Export terlebih dahulu.</string>
+    <string name="importLoyaltyCardKeychainMessage">Pilih ekspor Anda dari Loyalty Card Keychain untuk diimpor.\nBuatlah dari menu Impor/Ekspor di Loyalty Card Keychain dengan menekan Ekspor.</string>
    <string name="importVoucherVault">Impor dari Voucher Vault</string>
-    <string name="importVoucherVaultMessage">Pilih ekspor <i>vouchervault.json</i> Anda dari Voucher Vault untuk diimpor.
-\nBuat dengan menekan Ekspor di Voucher Vault terlebih dahulu.</string>
+    <string name="importVoucherVaultMessage">Pilih ekspor Anda dari Voucher Vault untuk diimpor.\nBuatlah dengan menekan tombol Ekspor di Voucher Vault.</string>
    <string name="unsupportedBarcodeType">Jenis barcode ini belum dapat ditampilkan. Ini mungkin didukung di versi aplikasi yang lebih baru.</string>
-    <string name="wrongValueForBarcodeType">Nilai tidak berlaku untuk jenis barcode yang dipilih</string>
+    <string name="wrongValueForBarcodeType">Nilai tersebut tidak valid untuk jenis barcode yang dipilih</string>
    <string name="frontImageDescription">Gambar depan</string>
    <string name="backImageDescription">Gambar belakang</string>
    <string name="updateBarcodeQuestionTitle">Perbarui barcode?</string>
    <string name="updateBarcodeQuestionText">Anda mengubah ID. Apakah Anda juga ingin memperbarui barcode untuk menggunakan nilai yang sama\?</string>
-    <string name="passwordRequired">Silahkan masukan kata sandi</string>
+    <string name="passwordRequired">Masukkan kata sandi</string>
    <string name="exportPassword">Tetapkan kata sandi untuk melindungi ekspor anda (opsional)</string>
-    <string name="failedGeneratingShareURL">Tidak dapat membuat alamat berbagi. Mohon laporkan ini.</string>
+    <string name="failedGeneratingShareURL">Tidak dapat menghasilkan URL yang dapat dibagikan</string>
    <string name="app_contributors">Pengembangan dibantu oleh: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="reverse">…dalam urutan terbalik</string>
-    <string name="version_history">Riwayat Versi</string>
+    <string name="version_history">Riwayat versi</string>
    <string name="help_translate_this_app">Bantu terjemahkan aplikasi ini</string>
-    <string name="source_repository">Sumber Repositori</string>
+    <string name="source_repository">Repositori sumber</string>
    <string name="on_github">di GitHub</string>
    <string name="and_data_usage">dan penggunaan data</string>
    <string name="on_google_play">di Google Play</string>
    <string name="cardShortcut">Pintasan Kartu</string>
    <string name="barcodeImageDescriptionWithType">Gambar <xliff:g>%s</xliff:g> barcode</string>
-    <string name="importExportHelp">Mencadangkan data anda akan memungkinkan memindahkannya ke perangkat lain.</string>
+    <string name="importExportHelp">Membackup data Anda memungkinkan Anda memindahkan data tersebut ke perangkat lain</string>
    <plurals name="selectedCardCount">
        <item quantity="other"><xliff:g>%d</xliff:g> kartu dipilih</item>
    </plurals>
@@ -174,7 +161,7 @@
    <plurals name="deleteCardsTitle">
        <item quantity="other">Hapus <xliff:g>%d</xliff:g> kartu</item>
    </plurals>
-    <string name="editGroup">Menyunting Grup: <xliff:g>%s</xliff:g></string>
+    <string name="editGroup">Kelompok pengeditan: <xliff:g>%s</xliff:g></string>
    <string name="selectColor">Pilih warna</string>
    <string name="noGiftCardsGroup">Buat beberapa kartu, kemudian masukkan mereka ke grup di sini</string>
    <string name="group_name_already_in_use">Nama grup telah dipakai</string>
@@ -189,7 +176,7 @@
    <string name="translate_platform">di Weblate</string>
    <string name="welcome">Selamat datang di Catima</string>
    <string name="failedToOpenUrl">Install browser web terlebih dahulu</string>
-    <string name="failedLaunchingPhotoPicker">Tidak dapat menemukan aplikasi galeri yang didukung</string>
+    <string name="failedLaunchingPhotoPicker">Tidak dapat menemukan pemilih gambar yang didukung</string>
    <string name="previousCard">Sebelumnya</string>
    <string name="nextCard">Berikutnya</string>
    <plurals name="balancePoints">
@@ -202,7 +189,6 @@
    <string name="archive">Arsip</string>
    <string name="archived">Kartu diarsipkan</string>
    <string name="failedToRetrieveImageFile">Gagal mengambil file gambar</string>
-    <string name="barcodeLongPressMessage">Hanya gambar yang dapat dibuka di aplikasi galeri</string>
    <string name="unarchive">Ekstrak</string>
    <string name="unarchived">Kartu tidak diarsipkan</string>
    <string name="options">Opsi</string>
@@ -225,8 +211,6 @@
    <string name="switchToFrontImage">Ubah ke depan gambar</string>
    <string name="switchToBackImage">Ubah ke belakang gambar</string>
    <string name="switchToBarcode">Ubah ke kode batang</string>
-    <string name="openFrontImageInGalleryApp">Buka gambar didepan di galeri app</string>
-    <string name="openBackImageInGalleryApp">Buka gambar dibelakang di galeri app</string>
    <string name="setBarcodeHeight">Atur tinggi kode batang</string>
    <string name="donate">Donasi</string>
    <string name="show_validity">Tunjukkan validitas</string>
@@ -234,7 +218,7 @@
    <string name="icon_header_click_text">Tekan lama untuk mengedit thumbnail</string>
    <string name="show_name_below_image_thumbnail">Tampilkan nama di bawah thumbnail gambar</string>
    <string name="show_note">Tampilkan catatan</string>
-    <string name="permissionReadCardsLabel">Baca Kartu Catima</string>
+    <string name="permissionReadCardsLabel">Bacalah kartu Catima</string>
    <string name="permissionReadCardsDescription">baca kartu Anda dan semua detailnya, termasuk catatan dan gambar</string>
    <string name="settings_allow_content_provider_read_title">Izinkan aplikasi lain mengakses data saya</string>
    <string name="settings_allow_content_provider_read_summary">Aplikasi masih harus meminta izin untuk diberikan akses</string>
@@ -260,15 +244,15 @@
    <string name="app_name">Catima</string>
    <string name="add_manually_warning_title">Pemindaian sangat dianjurkan</string>
    <string name="continue_">Lanjut</string>
-    <string name="failedLaunchingFileManager">Tidak dapat menemukan pengelola file yang didukung</string>
-    <string name="errorReadingFile">Tidak dapat membaca file</string>
+    <string name="failedLaunchingFileManager">Tidak dapat menemukan pengelola berkas yang didukung</string>
+    <string name="errorReadingFile">Tidak dapat membaca berkas</string>
    <string name="addFromPdfFile">Pilih file PDF</string>
    <string name="multipleBarcodesFoundPleaseChooseOne">Barcode mana yang ingin Anda gunakan?</string>
    <string name="pageWithNumber">Halaman <xliff:g>%d</xliff:g></string>
    <string name="spend">Dibelanjakan</string>
    <string name="receive">Terima</string>
    <string name="amountParsingFailed">Jumlah tidak valid</string>
-    <string name="add_manually_warning_message">Untuk beberapa toko, nilai barcode berbeda dengan nomor yang tertulis di kartu. Oleh karena itu, memasukkan barcode secara manual mungkin tidak selalu berhasil. Sangat disarankan untuk memindai barcode dengan kamera anda. Apakah anda masih ingin melanjutkan?</string>
+    <string name="add_manually_warning_message">Untuk beberapa kartu, nilai barcode berbeda dengan angka yang tertulis di kartu. Karena itu, memasukkan barcode secara manual mungkin tidak selalu berhasil. Disarankan untuk memindai barcode menggunakan kamera Anda. Apakah Anda tetap ingin melanjutkan?</string>
    <string name="noCameraFoundGuideText">Perangkat Anda sepertinya tidak memiliki kamera. Jika iya, coba mulai ulang perangkat. Jika tidak, gunakan tombol Opsi lainnya di bawah untuk menambahkan barcode dengan cara lain.</string>
    <string name="importCancelled">Impor dibatalkan</string>
    <string name="exportCancelled">Ekspor dibatalkan</string>
@@ -289,10 +273,28 @@
    <string name="settings_column_count_5">5</string>
    <string name="addFromPkpass">Pilih file Buku Tabungan (.pkpass / .pkpasses)</string>
    <string name="unsupportedFile">File ini tidak didukung</string>
-    <string name="generic_error_please_retry">Maaf, terjadi kesalahan, silakan coba lagi...</string>
-    <string name="sort_by_valid_from">Berlaku dari</string>
+    <string name="generic_error_please_retry">Terjadi kesalahan</string>
+    <string name="sort_by_valid_from">Berlaku mulai</string>
    <string name="width">Lebar</string>
    <string name="card_list_widget_name">Daftar kartu</string>
-    <string name="setBarcodeWidth">Atur Lebar Barcode</string>
+    <string name="setBarcodeWidth">Atur lebar barcode</string>
    <string name="card_list_widget_empty">Setelah Anda menambahkan beberapa kartu loyalitas di Catima, kartu tersebut akan muncul di sini. Jika Anda memiliki kartu sebelumnya, pastikan tidak semuanya diarsipkan.</string>
+    <string name="cardWithNumber">Kartu <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Kartu <xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>)</string>
+    <string name="pleaseDoNotRotateTheDevice">Jangan memutar perangkat, karena hal ini akan membatalkan tindakan</string>
+    <string name="acra_catima_has_crashed">Kami mohon maaf, tetapi <xliff:g id="app_name">%s</xliff:g> telah mengalami crash. Tolong bantu kami memperbaiki masalah ini dengan mengirimkan laporan kesalahan kepada kami.</string>
+    <string name="acra_explain_crash">Jika memungkinkan, tolong tambahkan detail lebih lanjut tentang apa yang Anda lakukan di sini:</string>
+    <string name="acra_crash_email_subject">Laporan crash <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="pref_enable_acra">Minta untuk mengirimkan laporan crash</string>
+    <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>
+    <string name="settings_disable_nfc_while_viewing_card">Jeda NFC</string>
+    <string name="settings_disable_nfc_while_viewing_card_summary">Menjeda NFC untuk mencegah pembayaran NFC terpicu saat melihat kartu</string>
+    <string name="nfc_blocked_while_viewing_card">NFC dijeda</string>
+    <string name="change_settings">Ubah pengaturan</string>
+    <string name="nfc_block_system_error">Gagal menjeda NFC</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,12 +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="settings_brown_theme">Brún</string>
-    <string name="settings_green_theme">Grænn</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>
-    <string name="settings_blue_theme">Blár</string>
-    <string name="settings_sky_blue_theme">Himinblár</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>
+    <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>
+    <string name="app_name">Catima</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>
@@ -17,14 +17,14 @@
    <string name="sendLabel">Invia…</string>
    <string name="editCardTitle">Modifica carta</string>
    <string name="addCardTitle">Aggiungi carta</string>
-    <string name="scanCardBarcode">Scansiona il codice</string>
-    <string name="cardShortcut">Scorciatoia per la carta</string>
+    <string name="scanCardBarcode">Scansiona codice a barre</string>
+    <string name="cardShortcut">Scorciatoia carta</string>
    <string name="noCardsMessage">Aggiungi prima una carta</string>
    <string name="noCardExistsError">Impossibile trovare quella carta</string>
-    <string name="failedParsingImportUriError">Impossibile analizzare l\'URI di importazione</string>
-    <string name="importExport">Importa/Esporta</string>
+    <string name="failedParsingImportUriError">Impossibile processare l\'URI di importazione</string>
+    <string name="importExport">Importa/esporta</string>
    <string name="exportName">Esporta</string>
-    <string name="importExportHelp">Il backup dei dati permette di spostarli su un altro dispositivo.</string>
+    <string name="importExportHelp">Il backup dei dati permette di spostarli su un altro dispositivo</string>
    <string name="importSuccessfulTitle">Importato</string>
    <string name="importFailedTitle">Importazione fallita</string>
    <string name="importFailed">Impossibile eseguire l\'importazione</string>
@@ -34,7 +34,7 @@
    <string name="importing">Importazione in corso…</string>
    <string name="exporting">Esportazione in corso…</string>
    <string name="importOptionFilesystemTitle">Importa dall\'archivio</string>
-    <string name="importOptionFilesystemExplanation">Scegli un file dall\'archivio.</string>
+    <string name="importOptionFilesystemExplanation">Scegli un file specifico dal filesystem</string>
    <string name="importOptionFilesystemButton">Dall\'archivio</string>
    <string name="about">Informazioni</string>
    <string name="app_license">Software libero con copyleft, licenza GPLv3+</string>
@@ -53,14 +53,14 @@
    <string name="importSuccessful">Dati importati</string>
    <string name="app_copyright_old">Basato su Loyalty Card Keychain
 \ncopyright © 2016–2020 Branden Archer</string>
-    <string name="exportOptionExplanation">I dati verranno scritti in una posizione a tua scelta.</string>
+    <string name="exportOptionExplanation">I dati verranno scritti nella posizione da te scelta</string>
    <string name="barcodeType">Tipo di codice a barre</string>
    <string name="unstar">Rimuovi dai preferiti</string>
    <string name="star">Aggiungi ai preferiti</string>
    <string name="starImage">Stella dei preferiti</string>
    <string name="deleteConfirmationGroup">Eliminare il gruppo\?</string>
    <string name="all">Tutti</string>
-    <string name="noGroups">Clicca sul pulsante + per aggiungere i gruppi per la categorizzazione.</string>
+    <string name="noGroups">Clicca sul pulsante + per aggiungere gruppi per la categorizzazione</string>
    <string name="groups">Gruppi</string>
    <string name="enter_group_name">Inserisci il nome del gruppo</string>
    <string name="groupsList">Gruppi: <xliff:g>%s</xliff:g></string>
@@ -69,7 +69,7 @@
    <string name="leaveWithoutSaveTitle">Esci</string>
    <string name="moveDown">Sposta in basso</string>
    <string name="moveUp">Sposta in alto</string>
-    <string name="failedOpeningFileManager">Installa prima un gestore di file.</string>
+    <string name="failedOpeningFileManager">Impossibile aprire un gestore di file</string>
    <string name="noBarcode">Nessun codice a barre</string>
    <plurals name="groupCardCount">
        <item quantity="one"><xliff:g>%d</xliff:g> carta</item>
@@ -94,17 +94,13 @@
    <string name="settings_disable_lockscreen_while_viewing_card">Impedisci il blocco dello schermo</string>
    <string name="accept">Accetta</string>
    <string name="privacy_policy">Informativa sulla riservatezza</string>
-    <string name="importVoucherVaultMessage">Seleziona il tuo file di esportazione <i>vouchervault.json</i> da Voucher Vault per importarlo.
-\nCrealo premendo prima Esporta in Voucher Vault.</string>
+    <string name="importVoucherVaultMessage">Seleziona il tuo file di esportazione da Voucher Vault per importarlo. \nCrealo premendo Esporta in Voucher Vault.</string>
    <string name="importVoucherVault">Importa da Voucher Vault</string>
-    <string name="importLoyaltyCardKeychainMessage">Seleziona il tuo file di esportazione <i>LoyaltyCardKeychain.csv</i> da Loyalty Card Keychain per importarlo.
-\nCrealo dal menù Importa/Esporta in Loyalty Card Keychain premendo prima su Esporta.</string>
+    <string name="importLoyaltyCardKeychainMessage">Seleziona il tuo file di esportazione da Loyalty Card Keychain per importarlo. \nCrealo dal menu Importa/Esporta in Loyalty Card Keychain premendo su Esporta.</string>
    <string name="importLoyaltyCardKeychain">Importa da Loyalty Card Keychain</string>
-    <string name="importFidmeMessage">Seleziona il tuo file di esportazione <i>fidme-export-request-xxxxxx.zip</i> da FidMe per importare e seleziona successivamente i tipi di codice a barre manualmente.
-\nCrealo dal tuo profilo FidMe scegliendo Protezione Dati e poi premendo Estrai i miei dati prima.</string>
+    <string name="importFidmeMessage">Seleziona il tuo file di esportazione da FidMe per importarlo, dopodiché seleziona i tipi di codice a barre manualmente. \nPer crearlo, si fa dal tuo profilo FidMe scegliendo \"Data Protection\" e poi \"Extract my data\".</string>
    <string name="importFidme">Importa da FidMe</string>
-    <string name="importCatimaMessage">Seleziona il file di esportazione <i>catima.zip</i> per importarlo.
-\nCrealo dal menù Importa/Esporta di un\'altra applicazione Catima premendo prima Esporta.</string>
+    <string name="importCatimaMessage">Seleziona il file di esportazione per importarlo. \nSi può creare dal menu Importa/esporta di un\'altra applicazione Catima premendo su Esporta.</string>
    <string name="importCatima">Importa da Catima</string>
    <string name="setBarcodeId">Imposta il valore del codice a barre</string>
    <string name="sameAsCardId">Uguale al codice</string>
@@ -114,8 +110,8 @@
    <string name="addFromImage">Seleziona un\'immagine dalla galleria</string>
    <string name="unsupportedBarcodeType">Questo tipo di codice a barre non può ancora essere visualizzato. Potrebbe essere supportato in una versione successiva dell\'applicazione.</string>
    <string name="wrongValueForBarcodeType">Il valore non è valido per il tipo di codice a barre selezionato</string>
-    <string name="app_resources">Risorse libere di terze parti: <xliff:g id="app_resources_list"> %s </xliff:g></string>
-    <string name="app_libraries">Librerie libere di terze parti: <xliff:g id="app_libraries_list"> %s </xliff:g></string>
+    <string name="app_resources">Risorse di terze parti: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Librerie di terze parti: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="intent_import_card_from_url_share_multiple_text">Voglio condividere alcune carte con te</string>
    <string name="no">No</string>
    <string name="yes">Sì</string>
@@ -128,10 +124,10 @@
    <string name="photos">Foto</string>
    <string name="backImageDescription">Immagine posteriore</string>
    <string name="frontImageDescription">Immagine frontale</string>
-    <string name="passwordRequired">Si prega di inserire la password</string>
+    <string name="passwordRequired">Inserire la password</string>
    <string name="turn_flashlight_off">Spegni la torcia</string>
    <string name="turn_flashlight_on">Accendi la torcia</string>
-    <string name="failedGeneratingShareURL">Impossibile generare un URL condivisibile. Si prega di segnalarlo.</string>
+    <string name="failedGeneratingShareURL">Impossibile generare un URL da condividere</string>
    <plurals name="selectedCardCount">
        <item quantity="one"><xliff:g>%d</xliff:g> selezionata</item>
        <item quantity="many"><xliff:g>%d</xliff:g> selezionate</item>
@@ -151,26 +147,17 @@
    </plurals>
    <string name="settings_system_locale">Sistema</string>
    <string name="settings_locale">Lingua</string>
-    <string name="settings_brown_theme">Marrone</string>
-    <string name="settings_green_theme">Verde</string>
-    <string name="settings_sky_blue_theme">Azzurro</string>
-    <string name="settings_blue_theme">Blu</string>
-    <string name="settings_violet_theme">Viola</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_pink_theme">Rosa</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Colore del tema</string>
    <string name="app_contributors">Reso possibile da: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="noGroupCards">Questo gruppo è vuoto</string>
    <string name="barcodeImageDescriptionWithType">Immagine del codice a barre in formato <xliff:g>%s</xliff:g></string>
    <string name="sort_by">Ordina per</string>
    <string name="reverse">…in ordine inverso</string>
    <string name="sort_by_expiry">Scadenza</string>
-    <string name="sort_by_most_recently_used">Usate più recentemente</string>
+    <string name="sort_by_most_recently_used">Le più recentemente utilizzate</string>
    <string name="sort_by_name">Nome</string>
    <string name="sort">Ordina</string>
    <string name="license">Licenza</string>
-    <string name="source_repository">Repository del codice sorgente</string>
+    <string name="source_repository">Repository dei sorgenti</string>
    <string name="on_github">su GitHub</string>
    <string name="exportPasswordHint">Inserisci la password</string>
    <string name="on_google_play">su Google Play</string>
@@ -206,7 +193,7 @@
    <string name="unarchive">Disarchivia</string>
    <string name="unarchived">Carta non archiviata</string>
    <string name="archived">Carta archiviata</string>
-    <string name="failedLaunchingPhotoPicker">Impossibile trovare un\'app galleria supportata</string>
+    <string name="failedLaunchingPhotoPicker">Impossibile trovare un selettore di immagini supportato</string>
    <plurals name="groupCardCountWithArchived">
        <item quantity="one"><xliff:g>%1$d</xliff:g> carta (<xliff:g id="archivedCount">%2$d</xliff:g> archiviata)</item>
        <item quantity="many"><xliff:g>%1$d</xliff:g> carte (<xliff:g id="archivedCount">%2$d</xliff:g> archiviate)</item>
@@ -217,8 +204,7 @@
    <string name="welcome">Benvenuti su Catima</string>
    <string name="failedToOpenUrl">Installa prima un browser web</string>
    <string name="failedToRetrieveImageFile">Impossibile ottenere il file dell\'immagine</string>
-    <string name="barcodeLongPressMessage">Si possono aprire solo immagini dell\'app della galleria</string>
-    <string name="cameraPermissionDeniedTitle">È impossibile accedere alla fotocamera</string>
+    <string name="cameraPermissionDeniedTitle">Impossibile accedere alla fotocamera</string>
    <string name="noCameraPermissionDirectToSystemSetting">Per poter scansionare i codici a barre, Catima ha bisogno di accedere alla tua fotocamera. Premi qui per poter cambiare le impostazioni dei permessi.</string>
    <string name="updateBalance">Aggiorna bilancio</string>
    <string name="updateBalanceTitle">Quanto hai speso o ricevuto?</string>
@@ -236,16 +222,14 @@
    <string name="switchToFrontImage">Passa all\'immagine frontale</string>
    <string name="switchToBackImage">Passa all\'immagine dietro</string>
    <string name="switchToBarcode">Passa al codice a barre</string>
-    <string name="openFrontImageInGalleryApp">Apri l\'immagine frontale nell\'app Galleria</string>
    <string name="donate">Dona</string>
-    <string name="openBackImageInGalleryApp">Apri l\'immagine posteriore nell\'app Galleria</string>
    <string name="setBarcodeHeight">Imposta l\'altezza del codice a barre</string>
    <string name="icon_header_click_text">Premi a lungo per modificare l\'immagine</string>
    <string name="show_note">Mostra nota</string>
    <string name="show_balance">Mostra bilancio</string>
    <string name="show_validity">Mostra validità</string>
    <string name="show_name_below_image_thumbnail">Mostra il nome sotto l\'immagine</string>
-    <string name="permissionReadCardsLabel">Leggi le carte Catima</string>
+    <string name="permissionReadCardsLabel">Leggi Carte Catima</string>
    <string name="settings_allow_content_provider_read_summary">Le applicazioni dovranno comunque richiedere l\'autorizzazione per ottenere l\'accesso</string>
    <string name="settings_allow_content_provider_read_title">Consenti ad altre applicazioni di accedere ai miei dati</string>
    <string name="permissionReadCardsDescription">Leggere le sue carte e tutti i suoi dettagli, comprese le note e le immagini</string>
@@ -272,7 +256,7 @@
    <string name="app_name">Catima</string>
    <string name="add_manually_warning_title">Consigliata scansione</string>
    <string name="continue_">Successivo</string>
-    <string name="add_manually_warning_message">In alcuni negozi, il valore del codice a barre differisce dal numero scritto sulla carta. Per questo motivo, l\'inserimento manuale del codice a barre potrebbe non funzionare sempre. Si consiglia di scansionare il codice a barre con la fotocamera. Vuoi continuare lo stesso?</string>
+    <string name="add_manually_warning_message">Per alcune carte, il valore del codice a barre differisce dal numero scritto sulla carta. Per questo motivo, l\'inserimento manuale del codice a barre potrebbe non funzionare sempre. Per questo motivo si consiglia di scansionare il codice a barre con la fotocamera. Vuoi procedere lo stesso?</string>
    <string name="amountParsingFailed">Importo non valido</string>
    <string name="spend">Spendi</string>
    <string name="receive">Ricevi</string>
@@ -300,11 +284,29 @@
    <string name="settings_column_count_5">5</string>
    <string name="settings_category_title_cards_overview">Panoramica delle carte</string>
    <string name="unsupportedFile">Questo file non è supportato</string>
-    <string name="generic_error_please_retry">Siamo spiacenti, qualcosa è andato storto, riprova...</string>
-    <string name="addFromPkpass">Seleziona un file Passbook (.pkpass)</string>
+    <string name="generic_error_please_retry">Rilevato un errore</string>
+    <string name="addFromPkpass">Seleziona un file Passbook (.pkpass/.pkpasses)</string>
    <string name="sort_by_valid_from">Valido da</string>
-    <string name="setBarcodeWidth">Imposta la larghezza del codice a barre</string>
+    <string name="setBarcodeWidth">Imposta larghezza del codice a barre</string>
    <string name="width">Larghezza</string>
    <string name="card_list_widget_name">Lista delle carte</string>
    <string name="card_list_widget_empty">Dopo aver aggiunto alcune carte fedeltà in Catima, queste appariranno qui. Se hai delle carte, assicurati che non siano tutte archiviate.</string>
+    <string name="cardWithNumber">Carta <xliff:g>%d</xliff:g></string>
+    <string name="cardWithNumberAndLocale">Carta <xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>)</string>
+    <string name="acra_crash_email_subject"><xliff:g id="app_name">%s</xliff:g> rapporto sull\'incidente</string>
+    <string name="pleaseDoNotRotateTheDevice">Si prega di non ruotare il dispositivo, perché così si annullerà l\'azione</string>
+    <string name="acra_catima_has_crashed">Siamo spiacenti, ma <xliff:g id="app_name">%s</xliff:g> si è interrotta. Aiutaci a risolvere questo problema inviandoci un resoconto dell\'errore.</string>
+    <string name="acra_explain_crash">Se possibile, si prega di aggiungere ulteriori dettagli su quello che si stava facendo:</string>
+    <string name="pref_enable_acra">Chiedi di inviare resoconti di interruzioni anomale</string>
+    <string name="pref_enable_acra_summary">Quando attivo, ti verrà chiesto di inviare un resoconto dell\'interruzione quando avviene. I resoconti non sono mai inviati automaticamente.</string>
+    <string name="copy_value">Copia valore</string>
+    <string name="copied_to_clipboard">Copiato negli appunti</string>
+    <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>
+    <string name="nfc_block_system_error">Impossibile mettere in pausa l\'NFC</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>