Update Fastlane changelogs

Allow store name thumbnails to span multiple lines

.github/workflows/android.yml

@@ -29,10 +29,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.7
     - name: Fail on bad translations
       run: if grep -ri "<xliff" app/src/main/res/values*/strings.xml; then echo "Invalidly escaped translations found"; exit 1; fi
-    - uses: gradle/wrapper-validation-action@v1
+    - uses: gradle/actions/wrapper-validation@v3
     - name: set up OpenJDK 17
       run: |
         sudo apt-get update
@@ -48,7 +48,7 @@ jobs:
       run: ./gradlew spotbugsRelease
     - name: Archive test results
       if: always()
-      uses: actions/upload-artifact@v4.3.0
+      uses: actions/upload-artifact@v4.3.3
       with:
         name: test-results
         path: app/build/reports

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

@@ -27,15 +27,15 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v4.1.1
+      uses: actions/checkout@v4.1.7
     - name: Setup Python
-      uses: actions/setup-python@v5.0.0
+      uses: actions/setup-python@v5.1.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@v5.0.2
+      uses: peter-evans/create-pull-request@v6.1.0
       with:
         title: "Update Fastlane changelogs"
         commit-message: "Update Fastlane changelogs"

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

@@ -25,7 +25,7 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v4.1.1
+      uses: actions/checkout@v4.1.7
     - name: Update contributors
       id: update_contributors
       uses: TheLastProject/contributors-to-file-action@v3.2.0
@@ -33,7 +33,7 @@ jobs:
         file_in_repo: app/src/main/res/raw/contributors.txt
         min_commit_count: 5
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5.0.2
+      uses: peter-evans/create-pull-request@v6.1.0
       with:
         title: "Update contributors"
         commit-message: "Update contributors"

.github/workflows/generate-feature-graphic.yml

@@ -6,6 +6,7 @@ on:
       - main
     paths:
       - 'fastlane/**/title.txt'
+      - '.scripts/generate_feature_graphic/**'
 permissions:
   actions: none
   checks: none
@@ -24,7 +25,7 @@ jobs:
   generate-feature-graphic:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.7
     - name: Install requirements
       run: |
         sudo apt-get update
@@ -38,7 +39,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@v5.0.2
+      uses: peter-evans/create-pull-request@v6.1.0
       with:
         title: "Update feature graphic"
         commit-message: "Update feature graphic"

.github/workflows/gradle-update.yml

@@ -21,12 +21,12 @@ jobs:
   gradle-update:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.7
     - uses: obfusk/gradle-update-action@v2.0.0
       id: gradle-update
-    - uses: gradle/wrapper-validation-action@v1
+    - uses: gradle/actions/wrapper-validation@v3
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5.0.2
+      uses: peter-evans/create-pull-request@v6.1.0
       with:
         title: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"
         commit-message: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"

.github/workflows/update-locales.yml

@@ -25,13 +25,13 @@ jobs:
   update-locales:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.7
     - 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@v5.0.2
+      uses: peter-evans/create-pull-request@v6.1.0
       with:
         title: "Update locales"
         commit-message: "Update locales"

.scripts/generate_feature_graphic/generate_feature_graphic.sh

@@ -10,14 +10,21 @@ for lang in "$script_location/../../fastlane/metadata/android/"*; do
   if grep -q — title.txt; then
     # Try splitting title.txt on — (em dash)
     IFS='—' read -r appname subtext < title.txt
-  else
+  elif grep -q – title.txt; then
+    # No result, try splitting title.txt on – (en dash)
+    IFS='–' read -r appname subtext < title.txt
+  elif grep -q - title.txt; then
     # No result, try splitting on - (dash)
     IFS='-' read -r appname subtext < title.txt
+  else
+    # No result, use the full title as app name and default subtext
+    appname=$(< title.txt)
+    subtext="Loyalty Card Wallet"
   fi
   export appname=${appname%% }
   export subtext=${subtext## }
-  # If there is subtext, change the .svg accordingly
-  if [ -n "$subtext" ]; then
+  # If the appname isn't Catima or there is subtext, change the .svg accordingly
+  if [ "$appname" != "Catima" ] || [ -n "$subtext" ]; then
     perl -pi -e 's/Catima/$ENV{appname}/' featureGraphic.svg
     perl -pi -e 's/Loyalty Card Wallet/$ENV{subtext}/' featureGraphic.svg
     # Set correct font or font size for language if needed
@@ -25,9 +32,10 @@ for lang in "$script_location/../../fastlane/metadata/android/"*; do
     # We specifically need the Serif version because of the 200 weight
     case "$(basename "$lang")" in
       bg|el-GR|ru-RU|uk) sed -i "s/Lexend Deca/Noto Serif/" featureGraphic.svg ;;
+      hi-IN) sed -i -e "s/Yesteryear/Noto Serif Devanagari/" -e "s/Lexend Deca/Noto Serif Devanagari/" featureGraphic.svg ;;
       ja-JP) sed -i "s/Lexend Deca/Noto Serif CJK JP/" featureGraphic.svg ;;
+      kn-IN) sed -i -e 's/font-size="150"/font-size="100"/' -e "s/Yesteryear/Noto Serif Kannada/" featureGraphic.svg ;;
       ko) sed -i "s/Lexend Deca/Noto Serif CJK KR/" featureGraphic.svg ;;
-      kn-IN) sed -i -e 's/font-size="150"/font-size="100"/' -e 's/y="285.511"/y="235.511"/' featureGraphic.svg ;;
       zh-CN) sed -i "s/Lexend Deca/Noto Serif CJK SC/" featureGraphic.svg ;;
       zh-TW) sed -i "s/Lexend Deca/Noto Serif CJK TC/" featureGraphic.svg ;;
       *) ;;

.scripts/locales.py

@@ -24,7 +24,7 @@ sed = [
 ]
 subprocess.run(sed, check=True)
 
-with open("app/src/main/res/xml/locales_config.xml", "w") as fh:
+with open("app/src/main/res/xml/locales_config.xml", "w", encoding="utf-8") as fh:
     fh.write('<?xml version="1.0" encoding="utf-8"?>\n')
     fh.write('<locale-config xmlns:android="http://schemas.android.com/apk/res/android">\n')
     fh.write('    <locale android:name="en-US" />\n')

.scripts/new-locales.py

@@ -19,15 +19,27 @@ REPLACE_CODES = {
 STATS_URL = "https://hosted.weblate.org/api/components/catima/catima/statistics/"
 
 
+class Error(Exception):
+    pass
+
+
 def get_weblate_langs() -> List[Tuple[str, int]]:
-    r = requests.get(STATS_URL, timeout=5)
-    r.raise_for_status()
+    url = STATS_URL
     results = []
-    for lang in r.json()["results"]:
-        if lang["code"] != "en":
-            code = REPLACE_CODES.get(lang["code"], lang["code"]).replace("_", "-r")
-            results.append((code, round(lang["translated_percent"])))
-    return sorted(results)
+    for _ in range(16):     # avoid endless loops just in case
+        r = requests.get(url, timeout=5)
+        r.raise_for_status()
+        data = r.json()
+        for lang in data["results"]:
+            if lang["code"] != "en":
+                code = REPLACE_CODES.get(lang["code"], lang["code"]).replace("_", "-r")
+                results.append((code, round(lang["translated_percent"])))
+        url = data["next"]
+        if not url:
+            return sorted(results)
+        if not url.split("?")[0] == STATS_URL:
+            raise Error(f"Unexpected next URL: {url}")
+    raise Error("Too many pages")
 
 
 def get_dir_langs() -> List[str]:
@@ -42,7 +54,7 @@ def get_dir_langs() -> List[str]:
 def get_xml_langs() -> List[Tuple[str, bool]]:
     results = []
     in_section = False
-    with open("app/src/main/res/values/settings.xml") as fh:
+    with open("app/src/main/res/values/settings.xml", encoding="utf-8") as fh:
         for line in fh:
             if not in_section and 'name="locale_values"' in line:
                 in_section = True
@@ -59,7 +71,7 @@ def get_xml_langs() -> List[Tuple[str, bool]]:
 def update_xml_langs(langs: List[Tuple[str, bool]]) -> None:
     lines: List[str] = []
     in_section = False
-    with open("app/src/main/res/values/settings.xml") as fh:
+    with open("app/src/main/res/values/settings.xml", encoding="utf-8") as fh:
         for line in fh:
             if not in_section and 'name="locale_values"' in line:
                 in_section = True
@@ -70,7 +82,7 @@ def update_xml_langs(langs: List[Tuple[str, bool]]) -> None:
                 else:
                     continue
             lines.append(line)
-    with open("app/src/main/res/values/settings.xml", "w") as fh:
+    with open("app/src/main/res/values/settings.xml", "w", encoding="utf-8") as fh:
         for line in lines:
             fh.write(line)
 

CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## Unreleased - 137
+
+- Allow long store names in preview to split over multiple lines
+
+## v2.30.0 - 136 (2024-06-18)
+
+- Support for creating a card when sharing plain text
+- Display image type instead of barcode below images
+- Fix possible crash when trying to import a backup from the Nextcloud app
+- Improved support for devices without camera
+
+## v2.29.1 - 135 (2024-05-19)
+
+- Various fixes and improvements to balance handling
+
+## v2.29.0 - 134 (2024-04-19)
+
+- Support for scanning PDF files for barcodes
+- Support for image files with multiple barcodes
+- Minor UI fixes
+
+## v2.28.0 - 133 (2024-03-08)
+
+- Target Android 14
+- Open card icon in gallery on touch
+- Improve design of Photos tab in edit view
+- Update spending screen to also support receiving
+
 ## v2.27.0 - 132 (2024-01-30)
 
 - Refine "Add card" workflow

Gemfile.lock

@@ -1,29 +1,32 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    artifactory (3.0.15)
+    artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.824.0)
-    aws-sdk-core (3.181.1)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.945.0)
+    aws-sdk-core (3.197.1)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.71.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-kms (1.85.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.134.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
+    aws-sdk-s3 (1.152.3)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.0)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
+    base64 (0.2.0)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
@@ -32,11 +35,10 @@ GEM
     declarative (0.0.20)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.103.0)
+    excon (0.110.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -65,15 +67,15 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.7)
-    fastlane (2.215.1)
+    fastimage (2.3.1)
+    fastlane (2.221.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
-      colored
+      colored (~> 1.2)
       commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
@@ -85,6 +87,7 @@ GEM
       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-storage (~> 1.31)
       highline (~> 2.0)
       http-cookie (~> 1.0.5)
@@ -93,10 +96,10 @@ GEM
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1, < 1.0.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
       terminal-table (~> 3)
@@ -105,11 +108,11 @@ GEM
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.49.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.1)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -117,62 +120,64 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
     google-apis-iamcredentials_v1 (0.17.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.7.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.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.8.0)
+    googleauth (1.8.1)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.6)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.6.3)
-    jwt (2.7.1)
-    mini_magick (4.12.0)
+    json (2.7.2)
+    jwt (2.8.2)
+      base64
+    mini_magick (4.13.1)
     mini_mime (1.1.5)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
+    multipart-post (2.4.1)
     nanaimo (0.3.0)
     naturally (2.2.1)
-    optparse (0.1.1)
+    nkf (0.2.0)
+    optparse (0.5.0)
     os (1.1.4)
-    plist (3.7.0)
-    public_suffix (5.0.3)
-    rake (13.0.6)
+    plist (3.7.1)
+    public_suffix (5.1.1)
+    rake (13.2.1)
     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.2.6)
+    rexml (3.2.9)
+      strscan
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    security (0.1.3)
-    signet (0.18.0)
+    security (0.1.5)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -180,22 +185,19 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
+    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.4.2)
-    webrick (1.8.1)
+    unicode-display_width (2.5.0)
     word_wrap (1.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -214,4 +216,4 @@ DEPENDENCIES
   fastlane
 
 BUNDLED WITH
-   2.3.26
+   2.5.9

app/build.gradle.kts

@@ -15,19 +15,19 @@ spotbugs {
 
 android {
     namespace = "protect.card_locker"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "me.hackerchick.catima"
         minSdk = 21
-        targetSdk = 33
-        versionCode = 132
-        versionName = "2.27.0"
+        targetSdk = 34
+        versionCode = 136
+        versionName = "2.30.0"
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
 
-        resourceConfigurations += listOf("ar", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "fi", "fr", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sv", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
+        resourceConfigurations += listOf("ar", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "fi", "fr", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sv", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
     }
 
     buildTypes {
@@ -87,13 +87,13 @@ android {
 dependencies {
 
     // AndroidX
-    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.appcompat:appcompat:1.7.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.exifinterface:exifinterface:1.3.7")
     implementation("androidx.palette:palette:1.0.0")
     implementation("androidx.preference:preference:1.2.1")
-    implementation("com.google.android.material:material:1.9.0")
-    implementation("com.github.yalantis:ucrop:2.2.8")
+    implementation("com.google.android.material:material:1.12.0")
+    implementation("com.github.yalantis:ucrop:2.2.9")
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
 
     // Splash Screen
@@ -101,7 +101,7 @@ dependencies {
 
     // Third-party
     implementation("com.journeyapps:zxing-android-embedded:4.3.0@aar")
-    implementation("com.google.zxing:core:3.5.2")
+    implementation("com.google.zxing:core:3.5.3")
     implementation("org.apache.commons:commons-csv:1.9.0")
     implementation("com.jaredrummler:colorpicker:1.1.0")
     implementation("net.lingala.zip4j:zip4j:2.11.5")
@@ -110,9 +110,9 @@ dependencies {
     implementation("io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0")
 
     // Testing
-    testImplementation("androidx.test:core:1.5.0")
+    testImplementation("androidx.test:core:1.6.1")
     testImplementation("junit:junit:4.13.2")
-    testImplementation("org.robolectric:robolectric:4.11.1")
+    testImplementation("org.robolectric:robolectric:4.12.2")
 }
 
 tasks.withType<SpotBugsTask>().configureEach {

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

@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">تصحيح Catima</string>
+</resources>

app/src/debug/res/values-el/strings.xml

@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Αποσφαλμάτωση Catima</string>
+</resources>

app/src/debug/res/values-pt-rBR/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Depuração do Catima</string>
+</resources>

app/src/debug/res/values-zh-rTW/strings.xml

@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima 除錯版</string>
+</resources>

app/src/debug/res/values/strings.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Catima Debug</string>
 </resources>

app/src/main/AndroidManifest.xml

@@ -16,7 +16,7 @@
 
     <uses-feature
         android:name="android.hardware.camera"
-        android:required="true" />
+        android:required="false" />
     <uses-feature
         android:name="android.hardware.camera.autofocus"
         android:required="false" />
@@ -43,7 +43,9 @@
                 <action android:name="android.intent.action.SEND" />
 
                 <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
                 <data android:mimeType="image/*" />
+                <data android:mimeType="application/pdf" />
             </intent-filter>
         </activity>
         <activity
@@ -111,10 +113,12 @@
             android:name=".preferences.SettingsActivity"
             android:label="@string/settings"
             android:theme="@style/AppTheme.NoActionBar" />
+        <!-- FIXME: locked screenOrientation is a workaround for https://github.com/CatimaLoyalty/Android/issues/1715, remove when https://github.com/CatimaLoyalty/Android/issues/513 is fixed -->
         <activity
             android:name=".ImportExportActivity"
             android:label="@string/importExport"
             android:exported="true"
+            android:screenOrientation="locked"
             android:theme="@style/AppTheme.NoActionBar">
 
             <!-- ZIP Intent Filter -->

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

@@ -12,7 +12,6 @@ import androidx.annotation.StringRes;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
-
 import protect.card_locker.databinding.AboutActivityBinding;
 
 public class AboutActivity extends CatimaAppCompatActivity {

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

@@ -12,12 +12,12 @@ import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import androidx.appcompat.widget.Toolbar;
+
 import com.google.zxing.BarcodeFormat;
 
 import java.util.ArrayList;
 
-import androidx.appcompat.widget.Toolbar;
-
 import protect.card_locker.databinding.BarcodeSelectorActivityBinding;
 
 /**

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

@@ -3,12 +3,17 @@ package protect.card_locker;
 public class BarcodeValues {
     private final String mFormat;
     private final String mContent;
+    private String mNote;
 
     public BarcodeValues(String format, String content) {
         mFormat = format;
         mContent = content;
     }
 
+    public void setNote(String note) {
+        mNote = note;
+    }
+
     public String format() {
         return mFormat;
     }
@@ -17,7 +22,5 @@ public class BarcodeValues {
         return mContent;
     }
 
-    public boolean isEmpty() {
-        return mFormat == null && mContent == null;
-    }
-}
+    public String note() { return mNote; }
+}

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

@@ -0,0 +1,6 @@
+package protect.card_locker;
+
+public interface BarcodeValuesListDisambiguatorCallback {
+    void onUserChoseBarcode(BarcodeValues barcodeValues);
+    void onUserDismissedSelector();
+}

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

@@ -15,13 +15,13 @@ import android.service.controls.actions.ControlAction;
 import android.service.controls.templates.StatelessTemplate;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+
 import java.util.List;
 import java.util.concurrent.Flow;
 import java.util.function.Consumer;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
-
 @RequiresApi(Build.VERSION_CODES.R)
 public class CardsOnPowerScreenService extends ControlsProviderService {
 

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

@@ -4,22 +4,24 @@ import android.app.Activity;
 import android.content.Context;
 import android.widget.Toast;
 
+import androidx.core.util.Consumer;
+
 import com.journeyapps.barcodescanner.CaptureManager;
 import com.journeyapps.barcodescanner.DecoratedBarcodeView;
 
 public class CatimaCaptureManager extends CaptureManager {
-    private final Context mContext;
+    private final Consumer<String> mErrorCallback;
 
-    public CatimaCaptureManager(Activity activity, DecoratedBarcodeView barcodeView) {
+    public CatimaCaptureManager(Activity activity, DecoratedBarcodeView barcodeView, Consumer<String> errorCallback) {
         super(activity, barcodeView);
 
-        mContext = activity.getApplicationContext();
+        mErrorCallback = errorCallback;
     }
 
     @Override
     protected void displayFrameworkBugMessageAndExit(String message) {
         // We don't want to exit, as we also have a enter from card image and add manually button here
-        // So we show a toast instead
-        Toast.makeText(mContext, message, Toast.LENGTH_LONG).show();
+        // So, instead, we call our error callback
+        mErrorCallback.accept(message);
     }
 }

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

@@ -8,14 +8,12 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.ImageButton;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import protect.card_locker.databinding.GroupLayoutBinding;
-import protect.card_locker.preferences.Settings;
 
 public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListItemViewHolder> {
     public final Context mContext;

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

@@ -1,10 +1,8 @@
 package protect.card_locker;
 
-import android.Manifest;
 import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.InputType;
@@ -14,25 +12,24 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.Toast;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.textfield.TextInputLayout;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import protect.card_locker.async.TaskHandler;
 import protect.card_locker.databinding.ImportExportActivityBinding;
 import protect.card_locker.importexport.DataFormat;
@@ -83,15 +80,21 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
                 Log.e(TAG, "Activity returned NULL uri");
                 return;
             }
-            try {
-                OutputStream writer = getContentResolver().openOutputStream(uri);
-                Log.e(TAG, "Starting file export with: " + result.toString());
-                startExport(writer, uri, exportPassword.toCharArray(), true);
-            } catch (IOException e) {
-                Log.e(TAG, "Failed to export file: " + result.toString(), e);
-                onExportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, result.toString()), uri);
-            }
-
+            // Running this in a thread prevents Android from throwing a NetworkOnMainThreadException for large files
+            // FIXME: This is still suboptimal, because showing that the export started is delayed until the network request finishes
+            new Thread() {
+                @Override
+                public void run() {
+                    try {
+                        OutputStream writer = getContentResolver().openOutputStream(uri);
+                        Log.d(TAG, "Starting file export with: " + result);
+                        startExport(writer, uri, exportPassword.toCharArray(), true);
+                    } catch (IOException e) {
+                        Log.e(TAG, "Failed to export file: " + result, e);
+                        onExportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, result.toString()), uri);
+                    }
+                }
+            }.start();
         });
         fileOpenLauncher = registerForActivityResult(new ActivityResultContracts.GetContent(), result -> {
             if (result == null) {
@@ -126,16 +129,19 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
             builder.setTitle(R.string.exportPassword);
 
             FrameLayout container = new FrameLayout(ImportExportActivity.this);
-            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-            params.leftMargin = 50;
-            params.rightMargin = 50;
+
+            final TextInputLayout textInputLayout = new TextInputLayout(ImportExportActivity.this);
+            textInputLayout.setEndIconMode(TextInputLayout.END_ICON_PASSWORD_TOGGLE);
+            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            params.setMargins(50, 10, 50, 0);
+            textInputLayout.setLayoutParams(params);
 
             final EditText input = new EditText(ImportExportActivity.this);
             input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-            input.setLayoutParams(params);
             input.setHint(R.string.exportPasswordHint);
 
-            container.addView(input);
+            textInputLayout.addView(input);
+            container.addView(textInputLayout);
             builder.setView(container);
             builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
                 exportPassword = input.getText().toString();
@@ -148,7 +154,6 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
             });
             builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
             builder.show();
-
         });
 
         // Check that there is a file manager available
@@ -161,14 +166,21 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
     }
 
     private void openFileForImport(Uri uri, char[] password) {
-        try {
-            InputStream reader = getContentResolver().openInputStream(uri);
-            Log.e(TAG, "Starting file import with: " + uri.toString());
-            startImport(reader, uri, importDataFormat, password, true);
-        } catch (IOException e) {
-            Log.e(TAG, "Failed to import file: " + uri.toString(), e);
-            onImportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, e.toString()), uri, importDataFormat);
-        }
+        // Running this in a thread prevents Android from throwing a NetworkOnMainThreadException for large files
+        // FIXME: This is still suboptimal, because showing that the import started is delayed until the network request finishes
+        new Thread() {
+            @Override
+            public void run() {
+                try {
+                    InputStream reader = getContentResolver().openInputStream(uri);
+                    Log.d(TAG, "Starting file import with: " + uri);
+                    startImport(reader, uri, importDataFormat, password, true);
+                } catch (IOException e) {
+                    Log.e(TAG, "Failed to import file: " + uri, e);
+                    onImportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, e.toString()), uri, importDataFormat);
+                }
+            }
+        }.start();
     }
 
     private void chooseImportType(boolean choosePicker,
@@ -320,9 +332,21 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
         AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
         builder.setTitle(R.string.passwordRequired);
 
-        final EditText input = new EditText(this);
+        FrameLayout container = new FrameLayout(ImportExportActivity.this);
+
+        final TextInputLayout textInputLayout = new TextInputLayout(ImportExportActivity.this);
+        textInputLayout.setEndIconMode(TextInputLayout.END_ICON_PASSWORD_TOGGLE);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        params.setMargins(50, 10, 50, 0);
+        textInputLayout.setLayoutParams(params);
+
+        final EditText input = new EditText(ImportExportActivity.this);
         input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-        builder.setView(input);
+        input.setHint(R.string.exportPasswordHint);
+
+        textInputLayout.addView(input);
+        container.addView(textInputLayout);
+        builder.setView(container);
 
         builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
             openFileForImport(uri, input.getText().toString().toCharArray());

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

@@ -4,13 +4,13 @@ import android.database.Cursor;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.math.BigDecimal;
 import java.util.Currency;
 import java.util.Date;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 public class LoyaltyCard implements Parcelable {
     public final int id;
     public final String store;
@@ -164,7 +164,7 @@ public class LoyaltyCard implements Parcelable {
 
     @Override
     public int describeContents() {
-        return id;
+        return 0;
     }
 
     @NonNull

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

@@ -15,13 +15,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.google.android.material.card.MaterialCardView;
-import com.google.android.material.color.MaterialColors;
-
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.util.ArrayList;
-
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
@@ -29,6 +22,13 @@ import androidx.core.graphics.BlendModeColorFilterCompat;
 import androidx.core.graphics.BlendModeCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.card.MaterialCardView;
+import com.google.android.material.color.MaterialColors;
+
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.util.ArrayList;
+
 import protect.card_locker.databinding.LoyaltyCardLayoutBinding;
 
 public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder> {
@@ -123,8 +123,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         }
 
         inputHolder.mCardIcon.setContentDescription(loyaltyCard.store);
-        Utils.setIconOrTextWithBackground(mContext, loyaltyCard, icon, inputHolder.mCardIcon, inputHolder.mCardText);
-        inputHolder.setIconBackgroundColor(Utils.getHeaderColor(mContext, loyaltyCard));
+        inputHolder.mIconBackgroundColor = Utils.setIconOrTextWithBackground(mContext, loyaltyCard, icon, inputHolder.mCardIcon, inputHolder.mCardText);
 
         inputHolder.toggleCardStateIcon(loyaltyCard.starStatus != 0, loyaltyCard.archiveStatus != 0, itemSelected(inputCursor.getPosition()));
 
@@ -339,11 +338,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             mArchivedBackground.invalidate();
 
         }
-
-        public void setIconBackgroundColor(int color) {
-            mIconBackgroundColor = color;
-            mCardIcon.setBackgroundColor(color);
-        }
     }
 
     public int dpToPx(int dp, Context mContext) {

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

@@ -646,11 +646,22 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                     Log.d("barcode card id editor", "barcode and card id editor picker returned without an intent");
                     return;
                 }
-                BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(Utils.BARCODE_SCAN, result.getResultCode(), intent, getApplicationContext());
 
-                cardId = barcodeValues.content();
-                barcodeType = barcodeValues.format();
-                barcodeId = "";
+                List<BarcodeValues> barcodeValuesList = Utils.parseSetBarcodeActivityResult(Utils.BARCODE_SCAN, result.getResultCode(), intent, getApplicationContext());
+
+                Utils.makeUserChooseBarcodeFromList(this, barcodeValuesList, new BarcodeValuesListDisambiguatorCallback() {
+                    @Override
+                    public void onUserChoseBarcode(BarcodeValues barcodeValues) {
+                        cardId = barcodeValues.content();
+                        barcodeType = barcodeValues.format();
+                        barcodeId = "";
+                    }
+
+                    @Override
+                    public void onUserDismissedSelector() {
+
+                    }
+                });
             }
         });
 

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

@@ -3,6 +3,7 @@ package protect.card_locker;
 import android.app.Application;
 
 import androidx.appcompat.app.AppCompatDelegate;
+
 import protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardLockerApplication extends Application {

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

@@ -1,7 +1,6 @@
 package protect.card_locker;
 
 import android.content.ActivityNotFoundException;
-import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.res.ColorStateList;
@@ -60,7 +59,6 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Currency;
 import java.util.Date;
 import java.util.List;
 import java.util.function.Predicate;
@@ -109,22 +107,25 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             return;
         }
 
+        ImageType imageType = imageTypes.get(mainImageIndex);
+
         // If the barcode is shown, switch to fullscreen layout
-        if (imageTypes.get(mainImageIndex) == ImageType.BARCODE) {
+        if (imageType == ImageType.BARCODE) {
             setFullscreen(true);
             return;
         }
 
         // If this is an image, open it in the gallery.
-        openCurrentMainImageInGallery();
+        openImageInGallery(imageType);
     }
 
-    private void openCurrentMainImageInGallery() {
-        ImageType wantedImageType = imageTypes.get(mainImageIndex);
-
+    private void openImageInGallery(ImageType imageType) {
         File file = null;
 
-        switch (wantedImageType) {
+        switch (imageType) {
+            case ICON:
+                file = Utils.retrieveCardImageAsFile(this, loyaltyCardId, ImageLocationType.icon);
+                break;
             case IMAGE_FRONT:
                 file = Utils.retrieveCardImageAsFile(this, loyaltyCardId, ImageLocationType.front);
                 break;
@@ -172,6 +173,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     enum ImageType {
         NONE,
+        ICON,
         BARCODE,
         IMAGE_FRONT,
         IMAGE_BACK
@@ -299,7 +301,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         binding.bottomAppBarNextButton.setOnClickListener(view -> prevNextCard(true));
         binding.bottomAppBarUpdateBalanceButton.setOnClickListener(view -> showBalanceUpdateDialog());
 
-        binding.iconContainer.setOnClickListener(view -> Toast.makeText(LoyaltyCardViewActivity.this, R.string.icon_header_click_text, Toast.LENGTH_LONG).show());
+        binding.iconContainer.setOnClickListener(view -> {
+            if (Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon) != null) {
+                openImageInGallery(ImageType.ICON);
+            } else {
+                Toast.makeText(LoyaltyCardViewActivity.this, R.string.icon_header_click_text, Toast.LENGTH_LONG).show();
+            }
+        });
         binding.iconContainer.setOnLongClickListener(view -> {
             Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
             Bundle bundle = new Bundle();
@@ -410,7 +418,11 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     private void showBalanceUpdateDialog() {
         AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+
+        // Header
         builder.setTitle(R.string.updateBalanceTitle);
+
+        // Layout
         FrameLayout container = new FrameLayout(this);
         FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
@@ -428,61 +440,91 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         currentTextview.setText(getString(R.string.currentBalanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
         layout.addView(currentTextview);
 
-        TextView updateTextView = new TextView(this);
-        updateTextView.setText(getString(R.string.newBalanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
-        layout.addView(updateTextView);
-
         final TextInputEditText input = new TextInputEditText(this);
-        Context dialogContext = this;
-        input.setInputType(InputType.TYPE_CLASS_NUMBER);
+        input.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
         input.setKeyListener(DigitsKeyListener.getInstance("0123456789,."));
         input.setHint(R.string.updateBalanceHint);
-        input.addTextChangedListener(new SimpleTextWatcher() {
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                BigDecimal newBalance;
-                try {
-                    newBalance = calculateNewBalance(loyaltyCard.balance, loyaltyCard.balanceType, s.toString());
-                } catch (ParseException e) {
-                    input.setTag(null);
-                    updateTextView.setText(getString(R.string.newBalanceSentence, Utils.formatBalance(dialogContext, loyaltyCard.balance, loyaltyCard.balanceType)));
-                    return;
-                }
 
-                // Save new balance into this element
-                input.setTag(newBalance);
-                updateTextView.setText(getString(R.string.newBalanceSentence, Utils.formatBalance(dialogContext, newBalance, loyaltyCard.balanceType)));
-            }
-        });
         layout.addView(input);
         layout.setLayoutParams(params);
         container.addView(layout);
 
+        // Set layout
         builder.setView(container);
-        builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
-            // Grab calculated balance from input field
-            BigDecimal newBalance = (BigDecimal) input.getTag();
-            if (newBalance == null) {
-                return;
+
+        // Buttons
+        builder.setPositiveButton(R.string.spend, (dialogInterface, i) -> {
+            // Calculate and update balance
+            try {
+                BigDecimal balanceChange = Utils.parseBalance(input.getText().toString(), loyaltyCard.balanceType);
+                BigDecimal newBalance = loyaltyCard.balance.subtract(balanceChange).max(new BigDecimal(0));
+                DBHelper.updateLoyaltyCardBalance(database, loyaltyCardId, newBalance);
+            } catch (ParseException e) {
+                Toast.makeText(getApplicationContext(), R.string.amountParsingFailed, Toast.LENGTH_LONG).show();
             }
 
-            // Actually update balance
-            DBHelper.updateLoyaltyCardBalance(database, loyaltyCardId, newBalance);
-            // Reload UI
+            // Reload state
             this.onResume();
+
+            // Show new balance
+            Toast.makeText(getApplicationContext(), getString(R.string.newBalanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)), Toast.LENGTH_LONG).show();
         });
-        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
+        builder.setNegativeButton(R.string.receive, (dialogInterface, i) -> {
+            // Calculate and update balance
+            try {
+                BigDecimal balanceChange = Utils.parseBalance(input.getText().toString(), loyaltyCard.balanceType);
+                BigDecimal newBalance = loyaltyCard.balance.add(balanceChange);
+                DBHelper.updateLoyaltyCardBalance(database, loyaltyCardId, newBalance);
+            } catch (ParseException e) {
+                Toast.makeText(getApplicationContext(), R.string.amountParsingFailed, Toast.LENGTH_LONG).show();
+            }
+
+            // Reload state
+            this.onResume();
+
+            // Show new balance
+            Toast.makeText(getApplicationContext(), getString(R.string.newBalanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)), Toast.LENGTH_LONG).show();
+        });
+        builder.setNeutralButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
         AlertDialog dialog = builder.create();
+
+        // Now that the dialog exists, we can bind something that affects the buttons
+        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(getString(R.string.amountParsingFailed));
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+                    return;
+                }
+
+                input.setError(null);
+                if (balanceChange.equals(new BigDecimal(0))) {
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+                } else {
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+                    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(true);
+                }
+            }
+        });
+
         dialog.show();
+
+        // Disable buttons (must be done **after** dialog is shown to prevent crash
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+        dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+
+        // Set focus on input field
         dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
         input.requestFocus();
     }
 
-    private BigDecimal calculateNewBalance(BigDecimal currentBalance, Currency currency, String unparsedSubtraction) throws ParseException {
-        BigDecimal subtraction = Utils.parseBalance(unparsedSubtraction, currency);
-        return currentBalance.subtract(subtraction).max(new BigDecimal(0));
-    }
-
     private void setBottomAppBarButtonState() {
         if (!loyaltyCard.note.isEmpty() || !loyaltyCardGroups.isEmpty() || hasBalance(loyaltyCard) || loyaltyCard.validFrom != null || loyaltyCard.expiry != null) {
             binding.bottomAppBarInfoButton.setVisibility(View.VISIBLE);
@@ -609,10 +651,15 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         cardIdString = loyaltyCard.cardId;
         barcodeIdString = loyaltyCard.barcodeId;
 
-        binding.cardIdView.setText(loyaltyCard.cardId);
+        binding.mainImageDescription.setText(loyaltyCard.cardId);
 
         // Display full text on click in case it doesn't fit in a single line
-        binding.cardIdView.setOnClickListener(v -> {
+        binding.mainImageDescription.setOnClickListener(v -> {
+            if (mainImageIndex != 0) {
+                // Don't show cardId dialog, we're displaying something else
+                return;
+            }
+
             TextView cardIdView = new TextView(LoyaltyCardViewActivity.this);
             cardIdView.setText(loyaltyCard.cardId);
             cardIdView.setTextIsSelectable(true);
@@ -691,6 +738,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         DBHelper.updateLoyaltyCardLastUsed(database, loyaltyCard.id);
 
         invalidateOptionsMenu();
+
+        ShortcutHelper.updateShortcuts(this, loyaltyCard);
     }
 
     private void setStateBasedOnImageTypes() {
@@ -790,6 +839,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             DBHelper.updateLoyaltyCardArchiveStatus(database, loyaltyCardId, 1);
             Toast.makeText(LoyaltyCardViewActivity.this, R.string.archived, Toast.LENGTH_LONG).show();
 
+            ShortcutHelper.removeShortcut(LoyaltyCardViewActivity.this, loyaltyCardId);
+
             // Re-init loyaltyCard with new data from DB
             onResume();
             invalidateOptionsMenu();
@@ -881,7 +932,9 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         if (imageTypes.isEmpty()) {
             barcodeRenderTarget.setVisibility(View.GONE);
             binding.mainCardView.setCardBackgroundColor(Color.TRANSPARENT);
-            binding.cardIdView.setTextColor(MaterialColors.getColor(binding.cardIdView, com.google.android.material.R.attr.colorOnSurfaceVariant));
+            binding.mainImageDescription.setTextColor(MaterialColors.getColor(binding.mainImageDescription, com.google.android.material.R.attr.colorOnSurfaceVariant));
+
+            binding.mainImageDescription.setText(loyaltyCard.cardId);
             return;
         }
 
@@ -890,7 +943,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         if (wantedImageType == ImageType.BARCODE) {
             barcodeRenderTarget.setBackgroundColor(Color.WHITE);
             binding.mainCardView.setCardBackgroundColor(Color.WHITE);
-            binding.cardIdView.setTextColor(getResources().getColor(R.color.md_theme_light_onSurfaceVariant));
+            binding.mainImageDescription.setTextColor(getResources().getColor(R.color.md_theme_light_onSurfaceVariant));
 
             if (waitForResize) {
                 redrawBarcodeAfterResize(!isFullscreen);
@@ -898,18 +951,23 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                 drawBarcode(!isFullscreen);
             }
 
+            binding.mainImageDescription.setText(loyaltyCard.cardId);
             barcodeRenderTarget.setContentDescription(getString(R.string.barcodeImageDescriptionWithType, format.prettyName()));
         } else if (wantedImageType == ImageType.IMAGE_FRONT) {
             barcodeRenderTarget.setImageBitmap(frontImageBitmap);
             barcodeRenderTarget.setBackgroundColor(Color.TRANSPARENT);
             binding.mainCardView.setCardBackgroundColor(Color.TRANSPARENT);
-            binding.cardIdView.setTextColor(MaterialColors.getColor(binding.cardIdView, com.google.android.material.R.attr.colorOnSurfaceVariant));
+            binding.mainImageDescription.setTextColor(MaterialColors.getColor(binding.mainImageDescription, com.google.android.material.R.attr.colorOnSurfaceVariant));
+
+            binding.mainImageDescription.setText(getString(R.string.frontImageDescription));
             barcodeRenderTarget.setContentDescription(getString(R.string.frontImageDescription));
         } else if (wantedImageType == ImageType.IMAGE_BACK) {
             barcodeRenderTarget.setImageBitmap(backImageBitmap);
             barcodeRenderTarget.setBackgroundColor(Color.TRANSPARENT);
             binding.mainCardView.setCardBackgroundColor(Color.TRANSPARENT);
-            binding.cardIdView.setTextColor(MaterialColors.getColor(binding.cardIdView, com.google.android.material.R.attr.colorOnSurfaceVariant));
+            binding.mainImageDescription.setTextColor(MaterialColors.getColor(binding.mainImageDescription, com.google.android.material.R.attr.colorOnSurfaceVariant));
+
+            binding.mainImageDescription.setText(getString(R.string.backImageDescription));
             barcodeRenderTarget.setContentDescription(getString(R.string.backImageDescription));
         } else {
             throw new IllegalArgumentException("Unknown image type: " + wantedImageType);

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

@@ -7,8 +7,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.CursorIndexOutOfBoundsException;
 import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Bitmap;
-import android.net.Uri;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -33,10 +31,10 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
 
-import java.io.IOException;
 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;
 
@@ -150,6 +148,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 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();
@@ -194,10 +193,12 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
     @Override
     protected void onCreate(Bundle inputSavedInstanceState) {
-        extractIntentFields(getIntent());
         SplashScreen.installSplashScreen(this);
         super.onCreate(inputSavedInstanceState);
 
+        // 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());
         setSupportActionBar(binding.toolbar);
@@ -287,11 +288,11 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             }
 
             Intent intent = result.getData();
-            BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(Utils.BARCODE_SCAN, result.getResultCode(), intent, this);
+            List<BarcodeValues> barcodeValuesList = Utils.parseSetBarcodeActivityResult(Utils.BARCODE_SCAN, result.getResultCode(), intent, this);
 
             Bundle inputBundle = intent.getExtras();
             String group = inputBundle != null ? inputBundle.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP) : null;
-            processBarcodeValues(barcodeValues, group);
+            processBarcodeValuesList(barcodeValuesList, group, false);
         });
 
         mSettingsLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
@@ -446,63 +447,59 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
     }
 
-    private void processBarcodeValues(BarcodeValues barcodeValues, String group) {
-        if (barcodeValues.isEmpty()) {
+    private void processBarcodeValuesList(List<BarcodeValues> barcodeValuesList, String group, boolean closeAppOnNoBarcode) {
+        if (barcodeValuesList.isEmpty()) {
             throw new IllegalArgumentException("barcodesValues may not be empty");
         }
 
-        Intent newIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-        Bundle newBundle = new Bundle();
-        newBundle.putString(LoyaltyCardEditActivity.BUNDLE_BARCODETYPE, barcodeValues.format());
-        newBundle.putString(LoyaltyCardEditActivity.BUNDLE_CARDID, barcodeValues.content());
-        if (group != null) {
-            newBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, group);
-        }
-        newIntent.putExtras(newBundle);
-        startActivity(newIntent);
+        Utils.makeUserChooseBarcodeFromList(MainActivity.this, barcodeValuesList, new BarcodeValuesListDisambiguatorCallback() {
+            @Override
+            public void onUserChoseBarcode(BarcodeValues barcodeValues) {
+                Intent newIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                Bundle newBundle = new Bundle();
+                newBundle.putString(LoyaltyCardEditActivity.BUNDLE_BARCODETYPE, barcodeValues.format());
+                newBundle.putString(LoyaltyCardEditActivity.BUNDLE_CARDID, barcodeValues.content());
+                if (group != null) {
+                    newBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, group);
+                }
+                newIntent.putExtras(newBundle);
+                startActivity(newIntent);
+            }
+
+            @Override
+            public void onUserDismissedSelector() {
+                if (closeAppOnNoBarcode) {
+                    finish();
+                }
+            }
+        });
     }
 
     private void onSharedIntent(Intent intent) {
         String receivedAction = intent.getAction();
         String receivedType = intent.getType();
 
-        // Check if an image was shared to us
+        // Check if an image or file was shared to us
         if (Intent.ACTION_SEND.equals(receivedAction)) {
-            if (!receivedType.startsWith("image/")) {
+            List<BarcodeValues> barcodeValuesList;
+
+            if (receivedType.equals("text/plain")) {
+                barcodeValuesList = Collections.singletonList(new BarcodeValues(null, intent.getStringExtra(Intent.EXTRA_TEXT)));
+            } else if (receivedType.startsWith("image/")) {
+                barcodeValuesList = Utils.retrieveBarcodesFromImage(this, intent.getParcelableExtra(Intent.EXTRA_STREAM));
+            } else if (receivedType.equals("application/pdf")) {
+                barcodeValuesList = Utils.retrieveBarcodesFromPdf(this, intent.getParcelableExtra(Intent.EXTRA_STREAM));
+            } else {
                 Log.e(TAG, "Wrong mime-type");
                 return;
             }
 
-            BarcodeValues barcodeValues;
-            Bitmap bitmap;
-
-            Uri data = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-            if (data == null) {
-                Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+            if (barcodeValuesList.isEmpty()) {
                 finish();
                 return;
             }
 
-            try {
-                bitmap = Utils.retrieveImageFromUri(this, data);
-            } catch (IOException e) {
-                Log.e(TAG, "Error getting data from image file");
-                e.printStackTrace();
-                Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                finish();
-                return;
-            }
-
-            barcodeValues = Utils.getBarcodeFromBitmap(bitmap);
-
-            if (barcodeValues.isEmpty()) {
-                Log.i(TAG, "No barcode found in image file");
-                Toast.makeText(this, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
-                finish();
-                return;
-            }
-
-            processBarcodeValues(barcodeValues, null);
+            processBarcodeValuesList(barcodeValuesList, null, true);
         }
     }
 
@@ -798,8 +795,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             b.putIntegerArrayList("cardList", cardList);
             intent.putExtras(b);
 
-            ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard);
-
             startActivity(intent);
         }
     }

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

@@ -13,6 +13,12 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.activity.OnBackPressedCallback;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
@@ -20,12 +26,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import androidx.activity.OnBackPressedCallback;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.RecyclerView;
-
 import protect.card_locker.databinding.ActivityManageGroupBinding;
 
 public class ManageGroupActivity extends CatimaAppCompatActivity implements ManageGroupCursorAdapter.CardAdapterListener {

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

@@ -14,17 +14,17 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
-import java.util.List;
-
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import java.util.List;
+
 import protect.card_locker.databinding.ManageGroupsActivityBinding;
 
 public class ManageGroupsActivity extends CatimaAppCompatActivity implements GroupCursorAdapter.GroupAdapterListener {

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

@@ -32,7 +32,6 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
-
 import androidx.core.content.ContextCompat;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -63,6 +62,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
     private static final int COMPAT_SCALE_FACTOR_DIP = 320;
 
     private static final int PERMISSION_SCAN_ADD_FROM_IMAGE = 100;
+    private static final int PERMISSION_SCAN_ADD_FROM_PDF = 101;
 
     private CaptureManager capture;
     private DecoratedBarcodeView barcodeScannerView;
@@ -74,9 +74,11 @@ public class ScanActivity extends CatimaAppCompatActivity {
     private ActivityResultLauncher<Intent> manualAddLauncher;
     // can't use the pre-made contract because that launches the file manager for image type instead of gallery
     private ActivityResultLauncher<Intent> photoPickerLauncher;
+    private ActivityResultLauncher<Intent> pdfPickerLauncher;
 
     static final String STATE_SCANNER_ACTIVE = "scannerActive";
     private boolean mScannerActive = true;
+    private boolean mHasError = false;
 
     private void extractIntentFields(Intent intent) {
         final Bundle b = intent.getExtras();
@@ -100,6 +102,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
 
         manualAddLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.SELECT_BARCODE_REQUEST, result.getResultCode(), result.getData()));
         photoPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_IMAGE_FILE, result.getResultCode(), result.getData()));
+        pdfPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_PDF_FILE, result.getResultCode(), result.getData()));
         customBarcodeScannerBinding.fabOtherOptions.setOnClickListener(view -> {
             setScannerActive(false);
 
@@ -109,7 +112,8 @@ public class ScanActivity extends CatimaAppCompatActivity {
                     new CharSequence[]{
                             getString(R.string.addWithoutBarcode),
                             getString(R.string.addManually),
-                            getString(R.string.addFromImage)
+                            getString(R.string.addFromImage),
+                            getString(R.string.addFromPdfFile)
                     },
                     (dialogInterface, i) -> {
                         switch (i) {
@@ -122,6 +126,9 @@ public class ScanActivity extends CatimaAppCompatActivity {
                             case 2:
                                 addFromImage();
                                 break;
+                            case 3:
+                                addFromPdfFile();
+                                break;
                             default:
                                 throw new IllegalArgumentException("Unknown 'Add a card in a different way' dialog option");
                         }
@@ -135,7 +142,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
 
         // Even though we do the actual decoding with the barcodeScannerView
         // CaptureManager needs to be running to show the camera and scanning bar
-        capture = new CatimaCaptureManager(this, barcodeScannerView);
+        capture = new CatimaCaptureManager(this, barcodeScannerView, this::onCaptureManagerError);
         Intent captureIntent = new Intent();
         Bundle captureIntentBundle = new Bundle();
         captureIntentBundle.putBoolean(Intents.Scan.BEEP_ENABLED, false);
@@ -172,9 +179,14 @@ public class ScanActivity extends CatimaAppCompatActivity {
             capture.onResume();
         }
 
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
-            showCameraPermissionMissingText(false);
+        if (!Utils.deviceHasCamera(this)) {
+            showCameraError(getString(R.string.noCameraFoundGuideText), false);
+        } else if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
+            showCameraPermissionMissingText();
+        } else {
+            hideCameraError();
         }
+
         scaleScreen();
     }
 
@@ -269,14 +281,24 @@ public class ScanActivity extends CatimaAppCompatActivity {
     private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
         super.onActivityResult(requestCode, resultCode, intent);
 
-        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
+        List<BarcodeValues> barcodeValuesList = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
 
-        if (barcodeValues.isEmpty()) {
+        if (barcodeValuesList.isEmpty()) {
             setScannerActive(true);
             return;
         }
 
-        returnResult(barcodeValues.content(), barcodeValues.format());
+        Utils.makeUserChooseBarcodeFromList(this, barcodeValuesList, new BarcodeValuesListDisambiguatorCallback() {
+            @Override
+            public void onUserChoseBarcode(BarcodeValues barcodeValues) {
+                returnResult(barcodeValues.content(), barcodeValues.format());
+            }
+
+            @Override
+            public void onUserDismissedSelector() {
+                setScannerActive(true);
+            }
+        });
     }
 
     private void addWithoutBarcode() {
@@ -344,42 +366,79 @@ public class ScanActivity extends CatimaAppCompatActivity {
     }
 
     public void addManually() {
-        Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
-        if (cardId != null) {
-            final Bundle b = new Bundle();
-            b.putString("initialCardId", cardId);
-            i.putExtras(b);
-        }
-        manualAddLauncher.launch(i);
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ScanActivity.this);
+        builder.setTitle(R.string.add_manually_warning_title);
+        builder.setMessage(R.string.add_manually_warning_message);
+        builder.setPositiveButton(R.string.continue_, (dialog, which) -> {
+            Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
+            if (cardId != null) {
+                final Bundle b = new Bundle();
+                b.putString("initialCardId", cardId);
+                i.putExtras(b);
+            }
+            manualAddLauncher.launch(i);
+        });
+        builder.setNegativeButton(R.string.cancel, (dialog, which) -> setScannerActive(true));
+        builder.setOnCancelListener(dialog -> setScannerActive(true));
+        builder.show();
     }
 
     public void addFromImage() {
         PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_IMAGE);
     }
 
-    private void addFromImageAfterPermission() {
-        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
-        photoPickerIntent.setType("image/*");
-        Intent contentIntent = new Intent(Intent.ACTION_GET_CONTENT);
-        contentIntent.setType("image/*");
+    public void addFromPdfFile() {
+        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_PDF);
+    }
 
-        Intent chooserIntent = Intent.createChooser(photoPickerIntent, getString(R.string.addFromImage));
+    private void addFromImageOrFileAfterPermission(String mimeType, ActivityResultLauncher<Intent> launcher, int chooserText, int errorMessage) {
+        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
+        photoPickerIntent.setType(mimeType);
+        Intent contentIntent = new Intent(Intent.ACTION_GET_CONTENT);
+        contentIntent.setType(mimeType);
+
+        Intent chooserIntent = Intent.createChooser(photoPickerIntent, getString(chooserText));
         chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] { contentIntent });
         try {
-            photoPickerLauncher.launch(chooserIntent);
+            launcher.launch(chooserIntent);
         } catch (ActivityNotFoundException e) {
             setScannerActive(true);
-            Toast.makeText(getApplicationContext(), R.string.failedLaunchingPhotoPicker, Toast.LENGTH_LONG).show();
+            Toast.makeText(getApplicationContext(), errorMessage, Toast.LENGTH_LONG).show();
             Log.e(TAG, "No activity found to handle intent", e);
         }
     }
 
-    private void showCameraPermissionMissingText(boolean show) {
-        customBarcodeScannerBinding.cameraPermissionDeniedLayout.cameraPermissionDeniedClickableArea.setOnClickListener(show ? v -> {
+    public void onCaptureManagerError(String errorMessage) {
+        if (mHasError) {
+            // We're already showing an error, ignore this new error
+            return;
+        }
+
+        showCameraError(errorMessage, false);
+    }
+
+    private void showCameraPermissionMissingText() {
+        showCameraError(getString(R.string.noCameraPermissionDirectToSystemSetting), true);
+    }
+
+    private void showCameraError(String message, boolean setOnClick) {
+        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorMessage.setText(message);
+
+        setCameraErrorState(true, setOnClick);
+    }
+
+    private void hideCameraError() {
+        setCameraErrorState(false, false);
+    }
+
+    private void setCameraErrorState(boolean visible, boolean setOnClick) {
+        mHasError = visible;
+
+        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorClickableArea.setOnClickListener(visible && setOnClick ? v -> {
             navigateToSystemPermissionSetting();
         } : null);
-        customBarcodeScannerBinding.cardInputContainer.setBackgroundColor(show ? obtainThemeAttribute(com.google.android.material.R.attr.colorSurface) : Color.TRANSPARENT);
-        customBarcodeScannerBinding.cameraPermissionDeniedLayout.getRoot().setVisibility(show ? View.VISIBLE : View.GONE);
+        customBarcodeScannerBinding.cardInputContainer.setBackgroundColor(visible ? obtainThemeAttribute(com.google.android.material.R.attr.colorSurface) : Color.TRANSPARENT);
+        customBarcodeScannerBinding.cameraErrorLayout.getRoot().setVisibility(visible ? View.VISIBLE : View.GONE);
     }
 
     private void scaleScreen() {
@@ -389,8 +448,8 @@ public class ScanActivity extends CatimaAppCompatActivity {
         float mediumSizePx = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,MEDIUM_SCALE_FACTOR_DIP,getResources().getDisplayMetrics());
         boolean shouldScaleSmaller = screenHeight < mediumSizePx;
 
-        customBarcodeScannerBinding.cameraPermissionDeniedLayout.cameraPermissionDeniedIcon.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
-        customBarcodeScannerBinding.cameraPermissionDeniedLayout.cameraPermissionDeniedTitle.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
+        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorIcon.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
+        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorTitle.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
     }
 
     private int obtainThemeAttribute(int attribute) {
@@ -416,10 +475,18 @@ public class ScanActivity extends CatimaAppCompatActivity {
         boolean granted = grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED;
 
         if (requestCode == CaptureManager.getCameraPermissionReqCode()) {
-            showCameraPermissionMissingText(!granted);
-        } else if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE) {
             if (granted) {
-                addFromImageAfterPermission();
+                hideCameraError();
+            } else {
+                showCameraPermissionMissingText();
+            }
+        } else if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE || requestCode == PERMISSION_SCAN_ADD_FROM_PDF) {
+            if (granted) {
+                if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE) {
+                    addFromImageOrFileAfterPermission("image/*", photoPickerLauncher, R.string.addFromImage, R.string.failedLaunchingPhotoPicker);
+                } else {
+                    addFromImageOrFileAfterPermission("application/pdf", pdfPickerLauncher, R.string.addFromPdfFile, R.string.failedLaunchingFileManager);
+                }
             } else {
                 setScannerActive(true);
                 Toast.makeText(this, R.string.storageReadPermissionRequired, Toast.LENGTH_LONG).show();

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

@@ -8,6 +8,11 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.os.Bundle;
 
+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;
@@ -15,11 +20,6 @@ import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
-import androidx.core.content.pm.ShortcutInfoCompat;
-import androidx.core.content.pm.ShortcutManagerCompat;
-import androidx.core.graphics.ColorUtils;
-import androidx.core.graphics.drawable.IconCompat;
-
 class ShortcutHelper {
     // Android documentation says that no more than 5 shortcuts
     // are supported. However, that may be too many, as not all
@@ -43,6 +43,11 @@ class ShortcutHelper {
      * used card shortcut is discarded.
      */
     static void updateShortcuts(Context context, LoyaltyCard card) {
+        if (card.archiveStatus == 1) {
+            // Don't add archived card to menu
+            return;
+        }
+
         LinkedList<ShortcutInfoCompat> list = new LinkedList<>(ShortcutManagerCompat.getDynamicShortcuts(context));
 
         SQLiteDatabase database = new DBHelper(context).getReadableDatabase();
@@ -108,18 +113,7 @@ class ShortcutHelper {
      * shortcut exists.
      */
     static void removeShortcut(Context context, int cardId) {
-        List<ShortcutInfoCompat> list = ShortcutManagerCompat.getDynamicShortcuts(context);
-
-        String shortcutId = Integer.toString(cardId);
-
-        for (int index = 0; index < list.size(); index++) {
-            if (list.get(index).getId().equals(shortcutId)) {
-                list.remove(index);
-                break;
-            }
-        }
-
-        ShortcutManagerCompat.setDynamicShortcuts(context, list);
+        ShortcutManagerCompat.removeDynamicShortcuts(context, Collections.singletonList(Integer.toString(cardId)));
     }
 
     static @NotNull

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

@@ -11,16 +11,16 @@ import android.view.Window;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-import com.google.android.material.color.MaterialColors;
-import com.google.android.material.textview.MaterialTextView;
-import com.yalantis.ucrop.UCropActivity;
-
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.ColorUtils;
 import androidx.core.view.WindowInsetsControllerCompat;
 
+import com.google.android.material.color.MaterialColors;
+import com.google.android.material.textview.MaterialTextView;
+import com.yalantis.ucrop.UCropActivity;
+
 public class UCropWrapper extends UCropActivity {
     public static final String UCROP_TOOLBAR_TYPEFACE_STYLE = "ucop_toolbar_typeface_style";
 

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

@@ -12,8 +12,12 @@ import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.ImageDecoder;
 import android.graphics.Matrix;
+import android.graphics.pdf.PdfRenderer;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraManager;
 import android.net.Uri;
 import android.os.Build;
+import android.os.ParcelFileDescriptor;
 import android.provider.MediaStore;
 import android.text.Layout;
 import android.text.Spanned;
@@ -35,10 +39,12 @@ import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.graphics.ColorUtils;
 import androidx.core.os.LocaleListCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
+import androidx.core.widget.TextViewCompat;
 import androidx.exifinterface.media.ExifInterface;
 import androidx.palette.graphics.Palette;
 
 import com.google.android.material.color.DynamicColors;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.LuminanceSource;
 import com.google.zxing.MultiFormatReader;
@@ -46,6 +52,8 @@ import com.google.zxing.NotFoundException;
 import com.google.zxing.RGBLuminanceSource;
 import com.google.zxing.Result;
 import com.google.zxing.common.HybridBinarizer;
+import com.google.zxing.multi.GenericMultipleBarcodeReader;
+import com.google.zxing.multi.MultipleBarcodeReader;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
@@ -60,10 +68,13 @@ import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
+import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Currency;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -83,12 +94,13 @@ public class Utils {
     public static final int SELECT_BARCODE_REQUEST = 2;
     public static final int BARCODE_SCAN = 3;
     public static final int BARCODE_IMPORT_FROM_IMAGE_FILE = 4;
-    public static final int CARD_IMAGE_FROM_CAMERA_FRONT = 5;
-    public static final int CARD_IMAGE_FROM_CAMERA_BACK = 6;
-    public static final int CARD_IMAGE_FROM_CAMERA_ICON = 7;
-    public static final int CARD_IMAGE_FROM_FILE_FRONT = 8;
-    public static final int CARD_IMAGE_FROM_FILE_BACK = 9;
-    public static final int CARD_IMAGE_FROM_FILE_ICON = 10;
+    public static final int BARCODE_IMPORT_FROM_PDF_FILE = 5;
+    public static final int CARD_IMAGE_FROM_CAMERA_FRONT = 6;
+    public static final int CARD_IMAGE_FROM_CAMERA_BACK = 7;
+    public static final int CARD_IMAGE_FROM_CAMERA_ICON = 8;
+    public static final int CARD_IMAGE_FROM_FILE_FRONT = 9;
+    public static final int CARD_IMAGE_FROM_FILE_BACK = 10;
+    public static final int CARD_IMAGE_FROM_FILE_ICON = 11;
 
     public static final String CARD_IMAGE_FILENAME_REGEX = "^(card_)(\\d+)(_(?:front|back|icon)\\.png)$";
 
@@ -131,6 +143,91 @@ public class Utils {
         return ColorUtils.calculateLuminance(backgroundColor) > LUMINANCE_MIDPOINT;
     }
 
+    static public List<BarcodeValues> retrieveBarcodesFromImage(Context context, Uri uri) {
+        Log.i(TAG, "Received image file with possible barcode");
+
+        if (uri == null) {
+            Log.e(TAG, "Uri did not contain any data");
+            Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        Bitmap bitmap;
+        try {
+            bitmap = retrieveImageFromUri(context, uri);
+        } catch (IOException e) {
+            Log.e(TAG, "Error getting data from image file");
+            e.printStackTrace();
+            Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        List<BarcodeValues> barcodesFromBitmap = getBarcodesFromBitmap(bitmap);
+
+        if (barcodesFromBitmap.isEmpty()) {
+            Log.i(TAG, "No barcode found in image file");
+            Toast.makeText(context, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
+        }
+
+        return barcodesFromBitmap;
+    }
+
+    static public List<BarcodeValues> retrieveBarcodesFromPdf(Context context, Uri uri) {
+        Log.i(TAG, "Received PDF file with possible barcode");
+        if (uri == null) {
+            Log.e(TAG, "Uri did not contain any data");
+            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        ParcelFileDescriptor parcelFileDescriptor = null;
+        PdfRenderer renderer = null;
+        List<BarcodeValues> barcodesFromPdfPages = new ArrayList<>();
+
+        try {
+            parcelFileDescriptor = context.getContentResolver().openFileDescriptor(uri, "r");
+            if (parcelFileDescriptor != null) {
+                renderer = new PdfRenderer(parcelFileDescriptor);
+
+                // Loop over all pages to find barcodes
+                Bitmap renderedPage;
+                for (int i = 0; i < renderer.getPageCount(); i++) {
+                    PdfRenderer.Page page = renderer.openPage(i);
+                    renderedPage = Bitmap.createBitmap(page.getWidth(), page.getHeight(), Bitmap.Config.ARGB_8888);
+                    page.render(renderedPage, null, null, PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY);
+                    page.close();
+
+                    List<BarcodeValues> barcodesFromPage = getBarcodesFromBitmap(renderedPage);
+                    for (BarcodeValues barcodeValues : barcodesFromPage) {
+                        barcodeValues.setNote(String.format(context.getString(R.string.pageWithNumber), i+1));
+                        barcodesFromPdfPages.add(barcodeValues);
+                    }
+                }
+            }
+        } catch (IOException e) {
+            Log.e(TAG, "Error reading PDF file", e);
+            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+        } finally {
+            // Resource handling
+            if (renderer != null) {
+                renderer.close();
+            }
+            if (parcelFileDescriptor != null) {
+                try {
+                    parcelFileDescriptor.close();
+                } catch (IOException e) {
+                    Log.e(TAG, "Error closing ParcelFileDescriptor", e);
+                }
+            }
+        }
+
+        if (barcodesFromPdfPages.isEmpty()) {
+            Log.i(TAG, "No barcode found in pdf file");
+            Toast.makeText(context, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
+        }
+        return barcodesFromPdfPages;
+    }
+
     /**
      * Returns the Barcode format and content based on the result of an activity.
      * It shows toasts to notify the end-user as needed itself and will return an empty
@@ -142,45 +239,20 @@ public class Utils {
      * @param context
      * @return BarcodeValues
      */
-    static public BarcodeValues parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
+    static public List<BarcodeValues> parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
         String contents;
         String format;
 
         if (resultCode != Activity.RESULT_OK) {
-            return new BarcodeValues(null, null);
+            return new ArrayList<>();
         }
 
         if (requestCode == Utils.BARCODE_IMPORT_FROM_IMAGE_FILE) {
-            Log.i(TAG, "Received image file with possible barcode");
+            return retrieveBarcodesFromImage(context, intent.getData());
+        }
 
-            Uri data = intent.getData();
-            if (data == null) {
-                Log.e(TAG, "Intent did not contain any data");
-                Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                return new BarcodeValues(null, null);
-            }
-
-            Bitmap bitmap;
-            try {
-                bitmap = retrieveImageFromUri(context, data);
-            } catch (IOException e) {
-                Log.e(TAG, "Error getting data from image file");
-                e.printStackTrace();
-                Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                return new BarcodeValues(null, null);
-            }
-
-            BarcodeValues barcodeFromBitmap = getBarcodeFromBitmap(bitmap);
-
-            if (barcodeFromBitmap.isEmpty()) {
-                Log.i(TAG, "No barcode found in image file");
-                Toast.makeText(context, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
-            }
-
-            Log.i(TAG, "Read barcode id: " + barcodeFromBitmap.content());
-            Log.i(TAG, "Read format: " + barcodeFromBitmap.format());
-
-            return barcodeFromBitmap;
+        if (requestCode == Utils.BARCODE_IMPORT_FROM_PDF_FILE) {
+            return retrieveBarcodesFromPdf(context, intent.getData());
         }
 
         if (requestCode == Utils.BARCODE_SCAN || requestCode == Utils.SELECT_BARCODE_REQUEST) {
@@ -196,7 +268,7 @@ public class Utils {
             Log.i(TAG, "Read barcode id: " + contents);
             Log.i(TAG, "Read format: " + format);
 
-            return new BarcodeValues(format, contents);
+            return Collections.singletonList(new BarcodeValues(format, contents));
         }
 
         throw new UnsupportedOperationException("Unknown request code for parseSetBarcodeActivityResult");
@@ -216,22 +288,22 @@ public class Utils {
         return MediaStore.Images.Media.getBitmap(context.getContentResolver(), data);
     }
 
-    static public BarcodeValues getBarcodeFromBitmap(Bitmap bitmap) {
+    static public List<BarcodeValues> getBarcodesFromBitmap(Bitmap bitmap) {
         // This function is vulnerable to OOM, so we try again with a smaller bitmap is we get OOM
         for (int i = 0; i < 10; i++) {
             try {
-                return Utils.getBarcodeFromBitmapReal(bitmap);
+                return Utils.getBarcodesFromBitmapReal(bitmap);
             } catch (OutOfMemoryError e) {
-                Log.w(TAG, "Ran OOM in getBarcodeFromBitmap! Trying again with smaller picture! Retry " + i + " of 10.");
+                Log.w(TAG, "Ran OOM in getBarcodesFromBitmap! Trying again with smaller picture! Retry " + i + " of 10.");
                 bitmap = Bitmap.createScaledBitmap(bitmap, (int) Math.round(0.75 * bitmap.getWidth()), (int) Math.round(0.75 * bitmap.getHeight()), false);
             }
         }
 
         // Give up
-        return new BarcodeValues(null, null);
+        return new ArrayList<>();
     }
 
-    static private BarcodeValues getBarcodeFromBitmapReal(Bitmap bitmap) {
+    static private List<BarcodeValues> getBarcodesFromBitmapReal(Bitmap bitmap) {
         // In order to decode it, the Bitmap must first be converted into a pixel array...
         int[] intArray = new int[bitmap.getWidth() * bitmap.getHeight()];
         bitmap.getPixels(intArray, 0, bitmap.getWidth(), 0, 0, bitmap.getWidth(), bitmap.getHeight());
@@ -240,15 +312,63 @@ public class Utils {
         LuminanceSource source = new RGBLuminanceSource(bitmap.getWidth(), bitmap.getHeight(), intArray);
         BinaryBitmap binaryBitmap = new BinaryBitmap(new HybridBinarizer(source));
 
+        List<BarcodeValues> barcodeValuesList = new ArrayList<>();
         try {
-            Result barcodeResult = new MultiFormatReader().decode(binaryBitmap);
+            MultiFormatReader multiFormatReader = new MultiFormatReader();
+            MultipleBarcodeReader multipleBarcodeReader = new GenericMultipleBarcodeReader(multiFormatReader);
 
-            return new BarcodeValues(barcodeResult.getBarcodeFormat().name(), barcodeResult.getText());
+            Result[] barcodeResults = multipleBarcodeReader.decodeMultiple(binaryBitmap);
+
+            for (Result barcodeResult : barcodeResults) {
+                Log.i(TAG, "Read barcode id: " + barcodeResult.getText());
+                Log.i(TAG, "Read format: " + barcodeResult.getBarcodeFormat().name());
+
+                barcodeValuesList.add(new BarcodeValues(barcodeResult.getBarcodeFormat().name(), barcodeResult.getText()));
+            }
+
+            return barcodeValuesList;
         } catch (NotFoundException e) {
-            return new BarcodeValues(null, null);
+            return barcodeValuesList;
         }
     }
 
+    static public void makeUserChooseBarcodeFromList(Context context, List<BarcodeValues> barcodeValuesList, BarcodeValuesListDisambiguatorCallback callback) {
+        // If there is only one choice, consider it chosen
+        if (barcodeValuesList.size() == 1) {
+            callback.onUserChoseBarcode(barcodeValuesList.get(0));
+            return;
+        }
+
+        // Ask user to choose a barcode
+        // TODO: This should contain an image of the barcode in question to help users understand the choice they're making
+        CharSequence[] barcodeDescriptions = new CharSequence[barcodeValuesList.size()];
+        for (int i = 0; i < barcodeValuesList.size(); i++) {
+            BarcodeValues barcodeValues = barcodeValuesList.get(i);
+            CatimaBarcode catimaBarcode = CatimaBarcode.fromName(barcodeValues.format());
+
+            String barcodeContent = barcodeValues.content();
+            // Shorten overly long barcodes
+            if (barcodeContent.length() > 22) {
+                barcodeContent = barcodeContent.substring(0, 20) + "…";
+            }
+
+            if (barcodeValues.note() != null) {
+                barcodeDescriptions[i] = String.format("%s: %s (%s)", barcodeValues.note(), catimaBarcode.prettyName(), barcodeContent);
+            } else {
+                barcodeDescriptions[i] = String.format("%s (%s)", catimaBarcode.prettyName(), barcodeContent);
+            }
+        }
+
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context);
+        builder.setTitle(context.getString(R.string.multipleBarcodesFoundPleaseChooseOne));
+        builder.setItems(
+                barcodeDescriptions,
+                (dialogInterface, i) -> callback.onUserChoseBarcode(barcodeValuesList.get(i))
+        );
+        builder.setOnCancelListener(dialogInterface -> callback.onUserDismissedSelector());
+        builder.show();
+    }
+
     static public Boolean isNotYetValid(Date validFromDate) {
         // The note in `hasExpired` does not apply here, since the bug was fixed before this feature was added.
         return validFromDate.after(getStartOfToday().getTime());
@@ -276,6 +396,7 @@ public class Utils {
 
     static public String formatBalance(Context context, BigDecimal value, Currency currency) {
         NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setGroupingUsed(false);
 
         if (currency == null) {
             numberFormat.setMaximumFractionDigits(0);
@@ -283,6 +404,7 @@ public class Utils {
         }
 
         NumberFormat currencyFormat = NumberFormat.getCurrencyInstance();
+        currencyFormat.setGroupingUsed(false);
         currencyFormat.setCurrency(currency);
         currencyFormat.setMinimumFractionDigits(currency.getDefaultFractionDigits());
         currencyFormat.setMaximumFractionDigits(currency.getDefaultFractionDigits());
@@ -292,6 +414,7 @@ public class Utils {
 
     static public String formatBalanceWithoutCurrencySymbol(BigDecimal value, Currency currency) {
         NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setGroupingUsed(false);
 
         if (currency == null) {
             numberFormat.setMaximumFractionDigits(0);
@@ -304,19 +427,72 @@ public class Utils {
         return numberFormat.format(value);
     }
 
+    private static final double LargestPreciseDouble = (double) (1l << 53);
+    static{
+        assert (LargestPreciseDouble + 1.0) == LargestPreciseDouble;
+        assert (LargestPreciseDouble - 1.0) != LargestPreciseDouble;
+    }
+
+    private static BigDecimal fromParsed(Number parsed){
+        if(parsed instanceof BigDecimal)
+            return (BigDecimal) parsed;
+
+        final double d = parsed.doubleValue();
+        if(d >= LargestPreciseDouble)
+            return new BigDecimal(parsed.longValue());
+        return new BigDecimal(d);
+    }
+
     static public BigDecimal parseBalance(String value, Currency currency) throws ParseException {
+        // This function expects the input string to not have any grouping (thousand separators).
+        // It will refuse to work otherwise
         NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setGroupingUsed(false);
+
+        if (numberFormat instanceof DecimalFormat) {
+            ((DecimalFormat) numberFormat).setParseBigDecimal(true);
+        }
 
         if (currency == null) {
             numberFormat.setMaximumFractionDigits(0);
         } else {
-            numberFormat.setMinimumFractionDigits(currency.getDefaultFractionDigits());
-            numberFormat.setMaximumFractionDigits(currency.getDefaultFractionDigits());
+            int fractionDigits = currency.getDefaultFractionDigits();
+
+            numberFormat.setMinimumFractionDigits(fractionDigits);
+            numberFormat.setMaximumFractionDigits(fractionDigits);
+
+            if (numberFormat instanceof DecimalFormat) {
+                // If the string contains both thousand separators and decimals separators, fail hard
+                DecimalFormatSymbols decimalFormatSymbols = ((DecimalFormat) numberFormat).getDecimalFormatSymbols();
+                char decimalSeparator = decimalFormatSymbols.getDecimalSeparator();
+
+                // Translate all non-digits to decimal separators, failing if we find more than 1.
+                // We loop over the codepoints to make sure eastern arabic numerals are not mistakenly
+                // treated as a separator.
+                boolean separatorFound = false;
+                StringBuilder translatedValue = new StringBuilder();
+                for (int i = 0; i < value.length();) {
+                    int character = value.codePointAt(i);
+
+                    if (Character.isDigit(character)) {
+                        translatedValue.append(value.charAt(i));
+                    } else {
+                        if (separatorFound) {
+                            throw new ParseException("Contains multiple separators", i);
+                        }
+
+                        separatorFound = true;
+                        translatedValue.append(decimalSeparator);
+                    }
+
+                    i += Character.charCount(character);
+                }
+
+                value = translatedValue.toString();
+            }
         }
 
-        Log.d(TAG, numberFormat.parse(value).toString());
-
-        return new BigDecimal(numberFormat.parse(value).toString());
+        return fromParsed(numberFormat.parse(value));
     }
 
     static public byte[] bitmapToByteArray(Bitmap bitmap) {
@@ -748,23 +924,46 @@ public class Utils {
                 .replaceAll("(?<!href=\")\\b(https?://[\\w@#%&+=:?/.-]*[\\w@#%&+=:?/-])", "<a href=\"$1\">$1</a>");
     }
 
-    public static void setIconOrTextWithBackground(Context context, LoyaltyCard loyaltyCard, Bitmap icon, ImageView backgroundOrIcon, TextView textWhenNoImage) {
+    /**
+     * Sets an icon or text with background on the given ImageView and/or TextView, including background colour.
+     *
+     * @param context Android context
+     * @param loyaltyCard Loyalty Card
+     * @param icon Bitmap of the icon to set, or null
+     * @param backgroundOrIcon ImageView to draw the icon and background on to
+     * @param textWhenNoImage TextView to write the loyalty card name into if icon is null
+     * @return background colour
+     */
+    public static int setIconOrTextWithBackground(Context context, LoyaltyCard loyaltyCard, Bitmap icon, ImageView backgroundOrIcon, TextView textWhenNoImage) {
+        int headerColor = getHeaderColor(context, loyaltyCard);
+        backgroundOrIcon.setImageBitmap(icon);
+        backgroundOrIcon.setBackgroundColor(headerColor);
+
         if (icon != null) {
-            Log.d("onResume", "setting icon image");
             textWhenNoImage.setVisibility(View.GONE);
-
-            backgroundOrIcon.setImageBitmap(icon);
-            backgroundOrIcon.setBackgroundColor(Color.TRANSPARENT);
         } else {
+            // Manually calculate how many lines will be needed
+            // This is necessary because Android's auto sizing will split over lines way before reaching the minimum font size and store names split over multiple lines are harder to scan with a quick glance so we should try to prevent it
+            // Because we have to write the text before we can actually know the exact laid out size (trying to delay this causes bugs where the autosize fails) we have to take some... weird shortcuts
+
+            // At this point textWhenNoImage.getWidth() still returns 0, so we cheat by calculating the whole width of the screen and then dividing it by the amount of columns
+            int textviewWidth = Resources.getSystem().getDisplayMetrics().widthPixels / context.getResources().getInteger(R.integer.main_view_card_columns);
+
+            // Calculate how wide a character is and calculate how many characters fit in a line
+            int characterWidth = TextViewCompat.getAutoSizeMinTextSize(textWhenNoImage);
+            int maxWidthPerLine = textviewWidth - textWhenNoImage.getPaddingStart() - textWhenNoImage.getPaddingEnd();
+
+            // Set amount of lines based on what could fit at most
+            int maxLines = ((loyaltyCard.store.length() * characterWidth) / maxWidthPerLine) + 1;
+            textWhenNoImage.setMaxLines(maxLines);
+
+            // Actually set the text and colour
             textWhenNoImage.setVisibility(View.VISIBLE);
-
-            int headerColor = getHeaderColor(context, loyaltyCard);
-
-            backgroundOrIcon.setImageBitmap(null);
-            backgroundOrIcon.setBackgroundColor(headerColor);
             textWhenNoImage.setText(loyaltyCard.store);
             textWhenNoImage.setTextColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
         }
+
+        return headerColor;
     }
 
     public static boolean installedFromGooglePlay(Context context) {
@@ -835,4 +1034,12 @@ public class Utils {
             return false;
         });
     }
+
+    public static boolean deviceHasCamera(Context context) {
+        try {
+            return ((CameraManager) context.getSystemService(Context.CAMERA_SERVICE)).getCameraIdList().length > 0;
+        } catch (CameraAccessException e) {
+            return false;
+        }
+    }
 }

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

@@ -3,12 +3,13 @@ package protect.card_locker.preferences;
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import java.util.Locale;
-
 import androidx.annotation.IntegerRes;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.preference.PreferenceManager;
+
+import java.util.Locale;
+
 import protect.card_locker.R;
 import protect.card_locker.Utils;
 

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

@@ -1,6 +1,5 @@
 package protect.card_locker.preferences;
 
-
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;

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

@@ -10,7 +10,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -20,11 +21,12 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="?attr/actionBarSize"
-        android:padding="10dp">
+        android:paddingVertical="8dp"
+        android:clipToPadding="false">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -35,7 +37,9 @@
                 android:id="@+id/version_history"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp">
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
 
                 <TextView
                     android:id="@+id/version_history_main"
@@ -74,7 +78,9 @@
                 android:id="@+id/credits"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp">
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
 
                 <TextView
                     android:id="@+id/credits_main"
@@ -113,7 +119,9 @@
                 android:id="@+id/translate"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp">
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
 
                 <TextView
                     android:id="@+id/translate_main"
@@ -153,7 +161,9 @@
                 android:id="@+id/license"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp">
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
 
                 <TextView
                     android:id="@+id/license_main"
@@ -193,7 +203,9 @@
                 android:id="@+id/repo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp">
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
 
                 <TextView
                     android:id="@+id/repo_main"
@@ -233,7 +245,9 @@
                 android:id="@+id/privacy"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp">
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
 
                 <TextView
                     android:id="@+id/privacy_main"
@@ -273,7 +287,9 @@
                 android:id="@+id/donate"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp">
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
 
                 <TextView
                     android:id="@+id/donate_main"
@@ -284,6 +300,7 @@
                     android:text="@string/donate"
                     android:textSize="18sp"
                     app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
@@ -303,7 +320,9 @@
                 android:id="@+id/rate"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp">
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
 
                 <TextView
                     android:id="@+id/rate_main"
@@ -340,10 +359,12 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:padding="8dp"
                 android:id="@+id/report_error"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
 
                 <TextView
                     android:id="@+id/report_error_main"
@@ -379,5 +400,5 @@
                     app:layout_constraintTop_toTopOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -31,13 +31,6 @@
                 android:layout_height="?attr/actionBarSize"
                 style="?attr/toolbarStyle" />
 
-            <com.google.android.material.tabs.TabLayout
-                android:id="@+id/groups"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                app:tabMode="scrollable" />
-
         </com.google.android.material.appbar.AppBarLayout>
 
 

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

@@ -9,20 +9,20 @@
     tools:showIn="@layout/custom_barcode_scanner">
 
     <LinearLayout
-        android:id="@+id/camera_permission_denied_clickable_area"
+        android:id="@+id/camera_error_clickable_area"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <ImageView
-            android:id="@+id/camera_permission_denied_icon"
+            android:id="@+id/camera_error_icon"
             android:layout_width="match_parent"
             android:layout_height="84dp"
             android:scaleType="fitCenter"
-            android:src="@drawable/camera_permission_denied" />
+            android:src="@drawable/camera_error" />
 
         <TextView
-            android:id="@+id/camera_permission_denied_title"
+            android:id="@+id/camera_error_title"
             style="@style/TextAppearance.Material3.HeadlineLarge"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -30,12 +30,12 @@
             android:text="@string/cameraPermissionDeniedTitle" />
 
         <TextView
-            android:id="@+id/camera_permission_denied_message"
+            android:id="@+id/camera_error_message"
             style="@style/AppTheme.TextView.NoData"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="@string/noCameraPermissionDirectToSystemSetting" />
+            android:text="@string/zxing_msg_camera_framework_bug" />
     </LinearLayout>
 
 </RelativeLayout>

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

@@ -34,8 +34,8 @@
         android:padding="@dimen/activity_scanner_padding">
 
         <include
-            android:id="@+id/camera_permission_denied_layout"
-            layout="@layout/camera_permission_failed_layout"
+            android:id="@+id/camera_error_layout"
+            layout="@layout/camera_error_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="gone"

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

@@ -7,7 +7,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -17,11 +18,11 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:fillViewport="true"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior">
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout android:orientation="vertical"
                       android:layout_width="fill_parent"
@@ -127,7 +128,7 @@
                 android:layout_marginTop="8dp"
                 android:text="@string/importOptionApplicationButton" />
         </LinearLayout>
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -18,7 +18,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -29,7 +30,8 @@
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent">
             <com.google.android.material.tabs.TabItem
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -46,9 +48,10 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <ScrollView android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
         <TableLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -369,79 +372,110 @@
                 android:visibility="gone"
                 tools:visibility="visible">
 
-                <!-- Front image -->
                 <LinearLayout
-                    android:id="@+id/frontImageHolder"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
-                    android:paddingHorizontal="@dimen/inputPadding"
-                    android:paddingTop="@dimen/inputPadding">
+                    android:baselineAligned="false">
 
                     <!-- Front image -->
                     <com.google.android.material.card.MaterialCardView
-                        android:layout_width="match_parent"
+                        android:id="@+id/frontImageHolder"
+                        android:layout_weight="1"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginStart="@dimen/activity_margin"
-                        android:layout_marginTop="@dimen/activity_margin"
-                        android:layout_marginEnd="@dimen/activity_margin"
-                        android:layout_marginBottom="@dimen/activity_margin"
-                        android:paddingHorizontal="@dimen/inputPadding"
-                        app:cardCornerRadius="4dp"
-                        app:cardElevation="0dp">
+                        android:orientation="horizontal"
+                        android:layout_margin="5dp"
+                        style="?attr/materialCardViewElevatedStyle">
 
-                        <ImageView
-                            android:id="@+id/frontImage"
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/frontImageConstraint"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:adjustViewBounds="true"
-                            android:minHeight="50dp"
-                            android:contentDescription="@string/frontImageDescription"
-                            android:scaleType="fitCenter"
-                            app:srcCompat="@drawable/ic_camera_white"
-                            android:background="?attr/colorPrimary" />
+                            android:layout_height="wrap_content">
 
+                            <!-- Back image -->
+                            <ImageView
+                                android:id="@+id/frontImage"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:adjustViewBounds="true"
+                                android:minHeight="50dp"
+                                android:contentDescription="@string/backImageDescription"
+                                android:scaleType="fitCenter"
+                                app:srcCompat="@drawable/ic_camera_white"
+                                android:background="?attr/colorPrimary"
+                                app:layout_constraintBottom_toTopOf="@id/frontImageDescription"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
+
+                            <TextView
+                                android:id="@+id/frontImageDescription"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="8dp"
+                                android:layout_marginEnd="8dp"
+                                android:layout_marginBottom="4dp"
+                                android:text="@string/frontImageDescription"
+                                android:textAppearance="?attr/textAppearanceHeadlineSmall"
+                                android:gravity="center"
+                                app:layout_constraintTop_toBottomOf="@id/frontImage"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"/>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
                     </com.google.android.material.card.MaterialCardView>
-                </LinearLayout>
-
-                <!-- Back image -->
-                <LinearLayout
-                    android:id="@+id/backImageHolder"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingHorizontal="@dimen/inputPadding"
-                    android:paddingTop="@dimen/inputPadding">
 
                     <!-- Back image -->
                     <com.google.android.material.card.MaterialCardView
-                        android:layout_width="match_parent"
+                        android:layout_weight="1"
+                        android:id="@+id/backImageHolder"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginStart="@dimen/activity_margin"
-                        android:layout_marginTop="@dimen/activity_margin"
-                        android:layout_marginEnd="@dimen/activity_margin"
-                        android:layout_marginBottom="@dimen/activity_margin"
-                        android:paddingHorizontal="@dimen/inputPadding"
-                        app:cardCornerRadius="4dp"
-                        app:cardElevation="0dp">
+                        android:orientation="horizontal"
+                        android:layout_margin="5dp"
+                        style="?attr/materialCardViewElevatedStyle">
 
-                        <ImageView
-                            android:id="@+id/backImage"
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/backImageConstraint"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:adjustViewBounds="true"
-                            android:minHeight="50dp"
-                            android:contentDescription="@string/backImageDescription"
-                            android:scaleType="fitCenter"
-                            app:srcCompat="@drawable/ic_camera_white"
-                            android:background="?attr/colorPrimary" />
+                            android:layout_height="wrap_content">
 
+                            <!-- Back image -->
+                            <ImageView
+                                android:id="@+id/backImage"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:adjustViewBounds="true"
+                                android:minHeight="50dp"
+                                android:contentDescription="@string/backImageDescription"
+                                android:scaleType="fitCenter"
+                                app:srcCompat="@drawable/ic_camera_white"
+                                android:background="?attr/colorPrimary"
+                                app:layout_constraintBottom_toTopOf="@id/backImageDescription"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
+
+                            <TextView
+                                android:id="@+id/backImageDescription"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="8dp"
+                                android:layout_marginEnd="8dp"
+                                android:layout_marginBottom="4dp"
+                                android:text="@string/backImageDescription"
+                                android:textAppearance="?attr/textAppearanceHeadlineSmall"
+                                android:gravity="center"
+                                app:layout_constraintTop_toBottomOf="@id/backImage"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"/>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
                     </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>
             </TableLayout>
         </TableLayout>
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -42,12 +42,8 @@
                 android:layout_height="match_parent"
                 android:textStyle="bold"
                 app:autoSizeTextType="uniform"
-                app:autoSizeMinTextSize="12sp"
-                app:autoSizeMaxTextSize="100sp"
-                app:autoSizeStepGranularity="2sp"
                 android:gravity="center"
-                android:maxLines="1"
-                android:layout_margin="20dp" />
+                android:padding="20dp" />
 
             <ImageView
                 android:importantForAccessibility="no"

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

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/coordinator_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -123,7 +121,7 @@
                                 android:layout_weight="1"/>
 
                             <TextView
-                                android:id="@+id/card_id_view"
+                                android:id="@+id/main_image_description"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:textSize="@dimen/text_size_large"

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

@@ -19,7 +19,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -31,6 +32,7 @@
             android:id="@+id/groups"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
             app:tabMode="scrollable"
             android:visibility="gone"/>
 

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

@@ -19,7 +19,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"

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

@@ -1,6 +1,5 @@
 <?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"
@@ -9,7 +8,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"

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

@@ -8,7 +8,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"

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

@@ -1,48 +1,55 @@
 Sylvia van Os
 Branden Archer
 J. Lavoie
-Allan Nordhøy
 solokot
+Allan Nordhøy
 Heimen Stoffels
-FC (Fay) Stegerman
 Oğuz Ersen
+FC (Fay) Stegerman
 Katharine Chui
-SlavekB
 StoyanDimitrov
+SlavekB
 mondstern
 IllusiveMan196
 Altonss
 Michael Moroni
 GM
 Eric
+laralem
 Petr Novák
 Joel A
-laralem
 Taco
 pfaffenrodt
 Aayush Gupta
 HudobniVolk
+大王叫我来巡山
 Nyatsuki
+Scrambled777
+Giovanni Donisi
+Jiri Grönroos
 Samantaz Fox
 arno-github
 Cliff Heraldo
 Sergio Paredes
 Ankit Tiwari
-Milan Šalka
-Balázs Meskó
-Giovanni Donisi
-Jiri Grönroos
 Milo Ivir
+Milan Šalka
+mdvhimself
+Balázs Meskó
 Skrripy
 huuhaa
+Jose Delvani
 Projjal Moitra
 Quentin PAGÈS
+ikanakova
+ngocanhtve
 waffshappen
-Eryk Michalak
 Ziad OUALHADJ
 Robin Liu
-mdvhimself
 Denis Shilin
+しいたけ
+Alexander Ivanov
+Viet Nguyen Hoang
 Miha Frangež
 Silvério Santos
 Virginie
@@ -52,4 +59,4 @@ Kim Seohyun
 Govind S Nair
 Freddo espresso
 arshbeerSingh
-Alexander Ivanov
+MisterCosta96

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

@@ -251,7 +251,7 @@
     <string name="barcodeLongPressMessage">يمكن فتح صور فقط في تطبيق معرض الصور</string>
     <string name="failedToOpenUrl">ثبت متصفح ويب أولاً</string>
     <string name="welcome">مرحبا بك في كاتيما</string>
-    <string name="updateBalanceTitle">كم أنفقت؟</string>
+    <string name="updateBalanceTitle">كم أنفقت أو استلمت؟</string>
     <string name="currentBalanceSentence">الرصيد الحالي: <xliff:g> %s </xliff:g></string>
     <plurals name="viewArchivedCardsWithCount">
         <item quantity="zero">عرض الأرشيف (<xliff:g>%1$d</xliff:g> بطاقة)</item>
@@ -267,7 +267,7 @@
     <string name="noCameraPermissionDirectToSystemSetting">لمسح الباركود، ستحتاج Catima إلى الوصول إلى الكاميرا. اضغط هنا لتغيير إعدادات الأذونات.</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>
@@ -310,6 +310,18 @@
     <string name="enter_card_id">أدخل رقم الهوية أو النص الموجود على بطاقتك</string>
     <string name="addWithoutBarcode">إضافة بدون باركود</string>
     <string name="field_must_not_be_empty">يجب ألا يكون الحقل فارغا</string>
-    <string name="app_name">كاتيما</string>
+    <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">التدوير دائمًا ( تجاهل إعدادات النظام)</string>
+    <string name="add_manually_warning_title">الفحص موصى به</string>
+    <string name="continue_">استمر</string>
+    <string name="spend">انفق</string>
+    <string name="receive">استلم</string>
+    <string name="amountParsingFailed">كمية غير صحيحة</string>
+    <string name="add_manually_warning_message">في بعض المتاجر قيمة الباركود تختلف عن الرقم الموجود على البطاقة. لهذا السبب إدخال الباركود يدوياً لن ينجح دائماً. من المستحسن فحص الباركود بكاميرا بدلا من ذالك. هل انت مُصِر على الاستكمال؟</string>
+    <string name="addFromPdfFile">تحديد ملف PDF</string>
+    <string name="errorReadingFile">لا يمكن قراءة الملف</string>
+    <string name="failedLaunchingFileManager">لم يتم العثور على مدير ملفات مدعوم</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">اي من الـbarcodes تريد استخدامه؟</string>
+    <string name="pageWithNumber">صفحة <xliff:g>%d</xliff:g></string>
+    <string name="noCameraFoundGuideText">يبدوا أن جهازك لا يمتلك كاميرا. إذا كان يمتلكها، أطفئ الجهاز وحاول مرة اخرى. اذا لم ينجح ذلك، أضغط على زر \"المزيد من الأختيارات\" في الأسفل لإضافة الباركود بطريقة أخرى.</string>
 </resources>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="storeName">Nome</string>
     <string name="note">Nota</string>
     <string name="noMatchingGiftCards">Nun hai nengún resultáu. Prueba a camudar la busca.</string>
@@ -24,10 +24,6 @@
     <string name="save">Guardar</string>
     <string name="edit">Editar</string>
     <string name="delete">Desaniciar</string>
-    <plurals name="deleteCardsTitle">
-        <item quantity="one"></item>
-        <item quantity="other"></item>
-    </plurals>
     <string name="unstar">Quitar de Favoritos</string>
     <string name="cancel">Encaboxar</string>
     <string name="importFailed">Nun se pudo facer la importación</string>

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

@@ -233,7 +233,7 @@
     <string name="barcodeLongPressMessage">В приложението галерия могат да бъдат отваряни само изображения</string>
     <string name="failedToRetrieveImageFile">Не е възможно извличане на изображение</string>
     <string name="noCameraPermissionDirectToSystemSetting">За да сканирате щрихкодове с Catima е необходим достъп до камерата. За да промените разрешението докоснете тук.</string>
-    <string name="updateBalanceTitle">Каква е промяната\?</string>
+    <string name="updateBalanceTitle">Колко е похарчено или получено?</string>
     <string name="updateBalanceHint">Въведете стойност</string>
     <string name="newBalanceSentence">Нов баланс: <xliff:g>%s</xliff:g></string>
     <string name="cameraPermissionDeniedTitle">Камерата е недостъпна</string>
@@ -284,4 +284,16 @@
     <string name="field_must_not_be_empty">Полето не трябва да е празно</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Винаги да се завърта (пренебрегва системната настройка)</string>
+    <string name="continue_">Продължаване</string>
+    <string name="add_manually_warning_title">Препоръчително е да сканирате</string>
+    <string name="add_manually_warning_message">Стойностите от щрихкода и отбелязаните на картата числа в някои случаи се различават. По тази причина е при ръчно въвеждане картата може да не работи. Силно препоръчително е да сканирате щрихкода с камерата. Желаете ли да продължите въпреки това?</string>
+    <string name="amountParsingFailed">Неприемлива сума</string>
+    <string name="spend">Похарчено</string>
+    <string name="receive">Получено</string>
+    <string name="pageWithNumber">Страница <xliff:g>%d</xliff:g></string>
+    <string name="addFromPdfFile">Изберете PDF</string>
+    <string name="errorReadingFile">Файлът не може да бъде прочетен</string>
+    <string name="failedLaunchingFileManager">Не е намерено приложение за управление на файлове</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Кой от намерените щрихкодове желаете да бъде използван?</string>
+    <string name="noCameraFoundGuideText">Изглежда, устройството няма камера. Ако има опитайте да рестартирате. В противен случай използвайте бутона „Още“, за да добавите шрихкод по друг начин.</string>
 </resources>

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

@@ -243,7 +243,7 @@
     <string name="unarchive">সংরক্ষণাগারমুক্ত করুন</string>
     <string name="archived">কার্ড সংরক্ষণাগারভুক্ত</string>
     <string name="welcome">Catima-তে স্বাগতম</string>
-    <string name="updateBalanceTitle">আপনি কত খরচ করেছেন\?</string>
+    <string name="updateBalanceTitle">আপনি কত খরচ করেছেন?</string>
     <string name="updateBalanceHint">পরিমান লিখুন</string>
     <string name="currentBalanceSentence">বর্তমান ব্যালেন্স: <xliff:g>%s</xliff:g></string>
     <string name="show_name_below_image_thumbnail">ছবির থাম্বনেইল এর নিচে নামটি দেখান</string>

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

@@ -2,13 +2,13 @@
 <resources>
     <string name="save">Snimi</string>
     <string name="cancel">Odustani</string>
-    <string name="unstar">Ukloni sve omiljene</string>
-    <string name="star">Omiljene</string>
-    <string name="barcodeType">Barcode tip</string>
-    <string name="note">Bilježnica</string>
+    <string name="unstar">Ukloni iz omiljenih</string>
+    <string name="star">Dodaj u omiljene</string>
+    <string name="barcodeType">Tip barkoda</string>
+    <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 uvozite nešto iz menija prvo.</string>
+    <string name="noGiftCards">Kliknite + Plus dugme da dodate kartu ili uvezete nešto iz menija prvo.</string>
     <string name="action_add">Dodaj</string>
     <string name="all">Sve</string>
     <string name="noGroupCards">Ova grupa ne sadrži nikakve karte</string>
@@ -104,4 +104,6 @@
     <string name="importOptionApplicationExplanation">Koristi bilo koju aplikaciju ili Vašu omiljenu aplikaciju da bi otvorili file.</string>
     <string name="importOptionApplicationButton">Koristi drugu aplikaciju</string>
     <string name="about">O</string>
-</resources>
+    <string name="noBarcode">Nema barkoda</string>
+    <string name="deleteTitle">Obriši karticu</string>
+</resources>

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

@@ -243,7 +243,7 @@
     <string name="updateBalance">Aktualizovat zůstatek</string>
     <string name="currentBalanceSentence">Současný zůstatek: <xliff:g>%s</xliff:g></string>
     <string name="noCameraPermissionDirectToSystemSetting">Pro skenování čárových kódů bude Catima potřebovat přístup k fotoaparátu. Klepněte zde pro změnu nastavení oprávnění.</string>
-    <string name="updateBalanceTitle">Kolik jste utratil\?</string>
+    <string name="updateBalanceTitle">Kolik jste utratil/a nebo obdržel/a?</string>
     <string name="updateBalanceHint">Zadejte výši</string>
     <string name="newBalanceSentence">Nový zůstatek: <xliff:g>%s</xliff:g></string>
     <string name="storageReadPermissionRequired">Pro tuto akci je potřeba oprávnění ke čtení úložiště…</string>
@@ -291,4 +291,15 @@
     <string name="field_must_not_be_empty">Položka nesmí být prázdná</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Vždy otáčet (ignoruje nastavení systému)</string>
+    <string name="continue_">Pokračovat</string>
+    <string name="add_manually_warning_title">Doporučuje se skenování</string>
+    <string name="add_manually_warning_message">V některých obchodech se hodnota čárového kódu liší od čísla napsaného na kartě. Z tohoto důvodu nemusí ruční zadání čárového kódu vždy fungovat. Důrazně doporučujeme místo toho naskenovat čárový kód pomocí fotoaparátu. Chcete přesto pokračovat?</string>
+    <string name="spend">Utratit</string>
+    <string name="receive">Obdržet</string>
+    <string name="amountParsingFailed">Neplatné množství</string>
+    <string name="addFromPdfFile">Vybrat soubor PDF</string>
+    <string name="errorReadingFile">Soubor nelze přečíst</string>
+    <string name="pageWithNumber">Stránka <xliff:g>%d</xliff:g></string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Který z nalezených čárových kódů chcete použít?</string>
+    <string name="failedLaunchingFileManager">Nelze nalézt podporovaný správce souborů</string>
 </resources>

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

@@ -12,16 +12,16 @@
     <string name="edit">Bearbeiten</string>
     <string name="delete">Löschen</string>
     <string name="confirm">Bestätigen</string>
-    <string name="star">Zu den Favoriten hinzufügen</string>
-    <string name="unstar">Aus den Favoriten entfernen</string>
+    <string name="star">Zu Favoriten hinzufügen</string>
+    <string name="unstar">Aus Favoriten entfernen</string>
     <string name="ok">OK</string>
-    <string name="sendLabel">Senden …</string>
+    <string name="sendLabel">Senden…</string>
     <string name="editCardTitle">Karte bearbeiten</string>
     <string name="addCardTitle">Neue Karte</string>
     <string name="scanCardBarcode">Barcode scannen</string>
-    <string name="cardShortcut">Shortcut zu einer Karte</string>
+    <string name="cardShortcut">Kartenkürzel</string>
     <string name="noCardsMessage">Füge zuerst eine Karte hinzu</string>
-    <string name="noCardExistsError">Diese Karte konnte nicht gefunden werden</string>
+    <string name="noCardExistsError">Konnte die Karte nicht finden</string>
     <string name="importExport">Import/Export</string>
     <string name="exportName">Export</string>
     <string name="importExportHelp">Wenn du deine Daten sicherst, kannst du sie auf ein anderes Gerät übertragen.</string>
@@ -33,12 +33,12 @@
     <string name="exportFailed">Export konnte nicht durchgeführt werden</string>
     <string name="importing">Importiere…</string>
     <string name="exporting">Exportiere…</string>
-    <string name="importOptionFilesystemTitle">Importiere aus dem Dateisystem</string>
-    <string name="importOptionFilesystemExplanation">Wähle eine Datei vom Dateisystem aus.</string>
-    <string name="importOptionFilesystemButton">Wähle vom Dateisystem</string>
-    <string name="importOptionApplicationTitle">Andere Anwendungen</string>
+    <string name="importOptionFilesystemTitle">Aus Dateisystem importieren</string>
+    <string name="importOptionFilesystemExplanation">Eine bestimmte Datei aus dem Dateisystem auswählen.</string>
+    <string name="importOptionFilesystemButton">vom Dateisystem</string>
+    <string name="importOptionApplicationTitle">Andere App verwenden</string>
     <string name="importOptionApplicationExplanation">Beliebige Anwendung oder deinen bevorzugten Dateimanager zur Dateiauswahl verwenden.</string>
-    <string name="importOptionApplicationButton">Aus anderer Anwendung</string>
+    <string name="importOptionApplicationButton">Andere App verwenden</string>
     <string name="about">Über</string>
     <string name="app_license">Freie Software, lizensiert unter der GPLv3+</string>
     <string name="about_title_fmt">Über <xliff:g id="app_name">%s</xliff:g></string>
@@ -66,7 +66,7 @@
     <string name="noGroups">Klicke auf das Pluszeichen +, um eine Gruppe hinzuzufügen.</string>
     <string name="noGroupCards">Diese Gruppe ist leer</string>
     <string name="groups">Gruppen</string>
-    <string name="enter_group_name">Gib einen Gruppennamen ein</string>
+    <string name="enter_group_name">Gruppennamen eingeben</string>
     <string name="leaveWithoutSaveConfirmation">Beenden ohne zu speichern\?</string>
     <string name="leaveWithoutSaveTitle">Beenden</string>
     <string name="failedOpeningFileManager">Installiere zuerst einen Dateimanager.</string>
@@ -95,7 +95,7 @@
     <string name="expiryStateSentence">Läuft ab: <xliff:g>%s</xliff:g></string>
     <string name="settings_disable_lockscreen_while_viewing_card">Sperrbildschirm verhindern</string>
     <string name="settings_keep_screen_on">Bildschirm aktiv lassen</string>
-    <string name="privacy_policy_popup_text">Hinweis zum Datenschutz (oft gefordert):
+    <string name="privacy_policy_popup_text">Hinweis zum Datenschutz (von einigen App-Stores verlangt):
 \n
 \nKEINE DATEN WERDEN GESAMMELT, was jeder bestätigen kann, da unsere Anwendung eine freie Software ist.</string>
     <string name="accept">Annehmen</string>
@@ -112,10 +112,10 @@
     <string name="importCatimaMessage">Wähle deinen <i>catima.zip</i>-Export aus Catima zum Importieren aus.
 \nErstelle ihn aus dem Import/Export-Menü einer anderen Catima-Anwendung, indem du dort zuerst Export drückst.</string>
     <string name="importCatima">Aus Catima importieren</string>
-    <string name="setBarcodeId">Manuell eingeben</string>
+    <string name="setBarcodeId">Barcodewert festlegen</string>
     <string name="sameAsCardId">Entspricht Kartennummer</string>
     <string name="barcodeId">Barcodewert</string>
-    <string name="errorReadingImage">Bildverarbeitung fehlgeschlagen</string>
+    <string name="errorReadingImage">Konnte das Bild nicht lesen</string>
     <string name="noBarcodeFound">Kein Barcode erkannt</string>
     <string name="addFromImage">Bild aus der Galerie wählen</string>
     <string name="unsupportedBarcodeType">Dieser Barcodetyp kann noch nicht angezeigt werden. Wir hoffen das Format in einer zukünftigen Version zu unterstützen.</string>
@@ -129,17 +129,17 @@
     <string name="updateBarcodeQuestionTitle">Barcodewert aktualisieren?</string>
     <string name="takePhoto">Foto aufnehmen</string>
     <string name="removeImage">Bild entfernen</string>
-    <string name="setBackImage">Kartenrückseite</string>
-    <string name="setFrontImage">Kartenvorderseite</string>
+    <string name="setBackImage">Rückseite einstellen</string>
+    <string name="setFrontImage">Vorderseite einstellen</string>
     <string name="photos">Fotos</string>
-    <string name="frontImageDescription">Bild der Vorseite</string>
-    <string name="backImageDescription">Bild der Rückseite</string>
+    <string name="frontImageDescription">Vorderseite</string>
+    <string name="backImageDescription">Rückseite</string>
     <string name="passwordRequired">Bitte gib das Passwort ein</string>
     <string name="importStocardMessage">Wähle deinen <i>***.zip</i>-Export aus Stocard zum Importieren aus.
 \nSie erhalten ihn, indem du eine E-Mail an support@stocardapp.com sendest und um einen Export deiner Daten bitten.</string>
     <string name="importStocard">Von Stocard importieren</string>
-    <string name="turn_flashlight_off">Licht ausschalten</string>
-    <string name="turn_flashlight_on">Licht einschalten</string>
+    <string name="turn_flashlight_off">Blitzlicht ausschalten</string>
+    <string name="turn_flashlight_on">Blitzlicht einschalten</string>
     <string name="failedGeneratingShareURL">URL konnte nicht erstellt werden. Bitte melde das an uns.</string>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> ausgewählt</item>
@@ -193,10 +193,10 @@
     <string name="editGroup">Gruppe wird bearbeitet: <xliff:g>%s</xliff:g></string>
     <string name="group_edit">Gruppe bearbeiten</string>
     <string name="noGiftCardsGroup">Erstelle einige Karten und ordne sie dann hier der Gruppe zu.</string>
-    <string name="setIcon">Vorschaubild setzen</string>
+    <string name="setIcon">Vorschaubild festlegen</string>
     <string name="selectColor">Farbe auswählen</string>
     <string name="translate_platform">auf Weblate</string>
-    <string name="shortcutSelectCard">Wählen Sie eine Karte</string>
+    <string name="shortcutSelectCard">Wähle eine Karte</string>
     <string name="options">Optionen</string>
     <string name="showMoreInfo">Infos anzeigen</string>
     <string name="starred">als Favorit</string>
@@ -231,9 +231,9 @@
     <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 haben Sie ausgegeben\?</string>
+    <string name="updateBalanceTitle">Wie viel hast du ausgegeben oder erhalten?</string>
     <string name="cameraPermissionDeniedTitle">Kein Zugriff auf die Kamera möglich</string>
-    <string name="noCameraPermissionDirectToSystemSetting">Um Strichcodes zu scannen, benötigt Catima Zugriff auf Ihre Kamera. Tippen Sie hier, um Ihre Berechtigungseinstellungen zu ändern.</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Um Strichcodes zu scannen, benötigt Catima Zugriff auf deine Kamera. Tippe hier, um deine Berechtigungseinstellungen zu ändern.</string>
     <string name="updateBalanceHint">Betrag eingeben</string>
     <string name="importCards">Karten importieren</string>
     <string name="currentBalanceSentence">Aktuelles Guthaben: <xliff:g>%s</xliff:g></string>
@@ -245,23 +245,23 @@
     <string name="validFromSentence">Gültig ab: <xliff:g>%s</xliff:g></string>
     <string name="chooseValidFromDate">Gültig-ab-Datum wählen</string>
     <string name="anyDate">Beliebiges Datum</string>
-    <string name="icon_header_click_text">Langes Drücken zum Bearbeiten der Vorschau</string>
-    <string name="switchToBarcode">Umschalten auf Barcode</string>
-    <string name="openFrontImageInGalleryApp">Vorderes Bild in der Galerie öffnen</string>
-    <string name="openBackImageInGalleryApp">Hinteres Bild in der Galerie öffnen</string>
+    <string name="icon_header_click_text">Zum Bearbeiten des Vorschaubildes lang drücken</string>
+    <string name="switchToBarcode">Zum Barcode wechseln</string>
+    <string name="openFrontImageInGalleryApp">Vorderseite in Galerie öffnen</string>
+    <string name="openBackImageInGalleryApp">Rückseite in Galerie öffnen</string>
     <string name="height">Höhe:</string>
-    <string name="switchToFrontImage">Zum vorderen Bild wechseln</string>
-    <string name="switchToBackImage">Zum hinteren Bild wechseln</string>
+    <string name="switchToFrontImage">Zur Vorderseite wechseln</string>
+    <string name="switchToBackImage">Zur Rückseite wechseln</string>
     <string name="setBarcodeHeight">Barcode-Höhe einstellen</string>
     <string name="donate">Spenden</string>
     <string name="show_note">Notiz anzeigen</string>
     <string name="show_balance">Betrag anzeigen</string>
     <string name="show_validity">Gültigkeitsdauer anzeigen</string>
-    <string name="show_name_below_image_thumbnail">Namen unter Bildvorschau anzeigen</string>
-    <string name="settings_allow_content_provider_read_title">Anderen Anwendungen den Zugriff auf meine Daten gestatten</string>
+    <string name="show_name_below_image_thumbnail">Namen unter Vorschaubild anzeigen</string>
+    <string name="settings_allow_content_provider_read_title">Anderen Apps den Zugriff auf meine Daten gestatten</string>
     <string name="permissionReadCardsLabel">Catima-Karten lesen</string>
-    <string name="permissionReadCardsDescription">lesen deiner Catima Karten mit allen Details, einschließlich Notizen und Bildern</string>
-    <string name="settings_allow_content_provider_read_summary">Anwendungen müssen weiterhin eine Genehmigung beantragen, um Zugriff zu erhalten</string>
+    <string name="permissionReadCardsDescription">Lesen deiner Catima Karten mit allen Details, einschließlich Notizen und Bildern</string>
+    <string name="settings_allow_content_provider_read_summary">Apps müssen weiterhin eine Genehmigung beantragen, um Zugriff zu erhalten</string>
     <string name="settings_display_barcode_max_brightness_summary">Erforderlich für das Funktionieren einiger Scanner</string>
     <string name="settings_keep_screen_on_summary">Deaktiviert die Bildschirmzeitüberschreitung beim Anzeigen einer Karte</string>
     <string name="settings_disable_lockscreen_while_viewing_card_summary">Deaktiviert die Bildschirmsperre während der Anzeige einer Karte</string>
@@ -269,9 +269,9 @@
     <string name="settings_category_title_cards">Karten</string>
     <string name="settings_category_title_privacy">Datenschutz</string>
     <string name="settings_category_title_general">Allgemein</string>
-    <string name="view_online">Zeige online</string>
+    <string name="view_online">Online anzeigen</string>
     <string name="action_display_options">Anzeigeoptionen</string>
-    <string name="show_archived_cards">Zeige archivierte Karten</string>
+    <string name="show_archived_cards">Archivierte Karten anzeigen</string>
     <string name="app_copyright_short">Copyright © Sylvia van Os und Mitwirkende</string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os und Mitwirkende</string>
     <string name="card_id_must_not_be_empty">Kartennummer darf nicht leer sein</string>
@@ -279,9 +279,21 @@
     <string name="add_a_card_in_a_different_way">Karte anders hinzufügen</string>
     <string name="action_more_options">Mehr Optionen</string>
     <string name="enter_card_id">Gib die Codenummer oder Ziffernfolge deiner Karte an</string>
-    <string name="addWithoutBarcode">Eine Karde ohne Code hinzufügen</string>
+    <string name="addWithoutBarcode">Eine Karte ohne Code hinzufügen</string>
     <string name="field_must_not_be_empty">Feld darf nicht leer sein</string>
-    <string name="manually_enter_barcode_instructions">Trage die ID Nummer oder Text deiner Karte ein und drücke auf den Barcode, der wie auf deiner Karte aussieht.</string>
+    <string name="manually_enter_barcode_instructions">Trage die ID Nummer oder Text deiner Karte ein und drücke auf den Barcode, der wie der auf deiner Karte aussieht.</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Immer drehen (ignoriert Systemeinstellungen)</string>
+    <string name="continue_">Fortfahren</string>
+    <string name="add_manually_warning_title">Es wird empfohlen, zu scannen</string>
+    <string name="add_manually_warning_message">In einigen Geschäften weicht der Wert des Barcodes von dem auf der Karte angegebenen Wert ab. Aus diesem Grund funktioniert die manuelle Eingabe des Barcodes in einigen Fällen nicht. Es wird dringend empfohlen, den Barcode mit einer Kamera zu scannen. Möchtest du dennoch fortfahren?</string>
+    <string name="spend">Zahlen</string>
+    <string name="receive">Erhalten</string>
+    <string name="amountParsingFailed">Ungültiger Betrag</string>
+    <string name="addFromPdfFile">PDF-Datei auswählen</string>
+    <string name="errorReadingFile">Datei konnte nicht gelesen werden</string>
+    <string name="failedLaunchingFileManager">Konnte keinen unterstützten Dateimanager finden</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Welchen der gefundenen Barcodes möchtest du verwenden?</string>
+    <string name="pageWithNumber">Seite <xliff:g>%d</xliff:g></string>
+    <string name="noCameraFoundGuideText">Dein Gerät scheint nicht über eine Kamera zu verfügen. Wenn dies der Fall ist, versuche, das Gerät neu zu starten. Andernfalls verwende die Schaltfläche Weitere Optionen unten, um einen Barcode auf andere Weise hinzuzufügen.</string>
 </resources>

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

@@ -14,13 +14,13 @@
     <string name="sendLabel">Αποστολή…</string>
     <string name="editCardTitle">Επεξεργασία Κάρτας</string>
     <string name="addCardTitle">Προσθήκη Κάρτας</string>
-    <string name="scanCardBarcode">Σαρώστε τον γραμμοκώδικα (bardcode)</string>
+    <string name="scanCardBarcode">Σαρώστε τον γραμμωτό κώδικα</string>
     <string name="cardShortcut">Συντόμευση Κάρτας</string>
     <string name="noCardsMessage">Προσθέστε μία κάρτα πρώτα</string>
     <string name="noCardExistsError">Δεν ήταν δυνατό να εντοπιστεί η κάρτα</string>
     <string name="importExport">Εισαγωγή/Εξαγωγή</string>
     <string name="exportName">Εξαγωγή</string>
-    <string name="importExportHelp">Τα αντίγραφα ασφαλείας, σας επιτρέπουν να τα εισάγετε σε άλλη συσκευή.</string>
+    <string name="importExportHelp">Τα αντίγραφα ασφαλείας σας επιτρέπουν να τα εισάγετε σε άλλη συσκευή.</string>
     <string name="importSuccessfulTitle">Εισήχθησαν</string>
     <string name="importFailedTitle">Εισαγωγή ανεπιτυχής</string>
     <string name="importFailed">Δεν ήταν δυνατή η εισαγωγή</string>
@@ -39,7 +39,7 @@
     <string name="app_license">Άδεια χρήσης υπό GPLv3+</string>
     <string name="about_title_fmt">Σχετικά με <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Έκδοση: <xliff:g id="version">%s</xliff:g></string>
-    <string name="selectBarcodeTitle">Επιλέξτε Barcode</string>
+    <string name="selectBarcodeTitle">Επιλέξτε γραμμωτό κώδικα</string>
     <string name="thumbnailDescription">Μικρογραφία</string>
     <string name="settings">Ρυθμίσεις</string>
     <string name="settings_dark_theme">Σκοτεινό</string>
@@ -54,7 +54,7 @@
         <item quantity="other"><xliff:g>%d</xliff:g> επιλέγχθηκαν</item>
     </plurals>
     <string name="noGiftCardsGroup">Δημιούργησε κάρτες και βάλτες σε αυτή την ομάδα.</string>
-    <string name="addManually">Χειροκίνητη εισαγωγή κωδικού</string>
+    <string name="addManually">Εισαγάγετε τον γραμμωτό κώδικα με μη αυτόματο τρόπο</string>
     <string name="never">Ποτέ</string>
     <string name="share">Κοινοποίηση</string>
     <plurals name="balancePoints">
@@ -64,14 +64,14 @@
     <string name="exportOptionExplanation">Τα δεδομένα θα μεταφερθούν σε τοποθεσία της επιλογής σας.</string>
     <string name="settings_theme">Θέμα</string>
     <string name="groupsList">Ομάδες: <xliff:g>%s</xliff:g></string>
-    <string name="barcodeId">Τιμή γραμμοκώδικα</string>
+    <string name="barcodeId">Τιμή γραμμωτού κώδικα</string>
     <string name="sort">Ταξινόμηση</string>
     <string name="deleteConfirmationGroup">Διαγραφή ομάδας;</string>
     <string name="moveDown">Προχώρα κάτω</string>
     <string name="accept">Αποδοχή</string>
     <string name="yes">Ναι</string>
     <string name="no">Όχι</string>
-    <string name="addFromImage">Επιλογή εικόνας από την συλλογή</string>
+    <string name="addFromImage">Επιλέξτε μια εικόνα από τη συλλογή</string>
     <string name="expiryStateSentence">Λήγει: <xliff:g>%s</xliff:g></string>
     <string name="expiryDate">Ημερομηνία λήξης</string>
     <string name="settings_keep_screen_on">Κράτα την οθόνη ανοιχτή</string>
@@ -91,18 +91,18 @@
     <string name="importLoyaltyCardKeychainMessage">Επιλέξτε την <i>LoyaltyCardKeychain.csv</i> εξαγωγή από το Loyalty Card Keychain για εισαγωγή.
 \nΔημιουργήστε το από το μενού Εισαγωγής/Εξαγωγής στο Loyalty Card Keychain επιλέγοντας Εξαγωγή.</string>
     <string name="importFidme">Εισαγωγή από FidMe</string>
-    <string name="importFidmeMessage">Επιλέξτε την <i>fidme-export-request-xxxxxx.zip</i> εξαγωγή από το FidMe για εισαγωγή και επιλέξτε χειροκίνητα τους τύπους γραμμοκώδικα μετέπειτα.
-\nΔημιουργήστε το από το FidMe προφίλ επιλέγοντας Προστασία Δεδομένων και διαλέγοντας εξαγωγή δεδομένων.</string>
-    <string name="setBarcodeId">Επιλέξτε τιμή γραμμοκώδικα</string>
-    <string name="wrongValueForBarcodeType">Η τιμή δεν είναι έγκυρη για αυτού του τύπου γραμμοκώδικα</string>
+    <string name="importFidmeMessage">Επιλέξτε την <i>fidme-export-request-xxxxxx.zip</i> εξαγωγή από το FidMe για εισαγωγή και επιλέξτε χειροκίνητα τους τύπους γραμμωτού κώδικα μετέπειτα. 
+\nΔημιουργήστε το από το FidMe προφίλ επιλέγοντας Προστασία Δεδομένων και πατώντας Εξαγωγή δεδομένων πρώτα.</string>
+    <string name="setBarcodeId">Επιλέξτε τιμή γραμμωτού κώδικα</string>
+    <string name="wrongValueForBarcodeType">Η τιμή δεν είναι έγκυρη για τον επιλεγμένο γραμμωτό κώδικα</string>
     <string name="setBackImage">Επιλογή οπίσθιας εικόνας</string>
     <string name="removeImage">Αφαίρεση εικόνας</string>
     <string name="takePhoto">Τραβήξτε μια φωτογραφία</string>
-    <string name="updateBarcodeQuestionText">Αλλάξατε τον κωδικό. Θέλετε να ενημερώσετε και τον γραμμοκώδικα στην ίδια τιμή;</string>
+    <string name="updateBarcodeQuestionText">Αλλάξατε τον κωδικό. Θέλετε να ενημερώσετε και τον γραμμωτό κώδικα στην ίδια τιμή;</string>
     <string name="options">Επιλογές</string>
     <string name="noGroupCards">Αυτή η ομάδα είναι άδεια</string>
-    <string name="settings_display_barcode_max_brightness">Επιπλέον φωτισμός γραμμοκώδικα</string>
-    <string name="group_name_is_empty">Το όνομα ομάδας δεν γίνεται να είναι κενό</string>
+    <string name="settings_display_barcode_max_brightness">Επιπλέον φωτισμός γραμμωτού κώδικα</string>
+    <string name="group_name_is_empty">Το όνομα της ομάδας δεν πρέπει να είναι κενό</string>
     <string name="group_edit">Επεξεργασία ομάδας</string>
     <string name="star">Προσθήκη στα αγαπημένα</string>
     <string name="unstar">Αφαίρεση από τα αγαπημένα</string>
@@ -114,7 +114,7 @@
     <string name="currency">Νόμισμα</string>
     <string name="privacy_policy">Πολιτική απορρήτου</string>
     <string name="chooseImportType">Εισαγωγή δεδομένων από</string>
-    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="app_loyalty_card_keychain">Lοyalty Card Keychain</string>
     <string name="privacy_policy_popup_text">Σημείωμα πολιτικής απορρήτου ( υποχρεωτικό σε κάποια \"μαγαζιά\" εφαρμογών)
 \n
 \nΜΗΔΕΝΙΚΆ ΔΕΔΟΜΈΝΑ ΣΥΛΛΈΓΟΝΤΑΙ, ο οποιοσδήποτε μπορεί να το επιβεβαιώσει μιας και η εφαρμογή είναι ελεύθερο λογισμικό.</string>
@@ -131,21 +131,21 @@
     <string name="setFrontImage">Επιλογή μπροστινής εικόνας</string>
     <string name="importVoucherVaultMessage">Επιλέξτε την <i>vouchervault.json</i> εξαγωγή από το Voucher Vault για εισαγωγή.
 \nΔημιουργήστε το επιλέγοντας Εξαγωγή στο Voucher Vault.</string>
-    <string name="unsupportedBarcodeType">Ο τύπος γραμμοκώδικα δεν γίνεται να εμφανιστεί ακόμα. Μπορεί να υποστηρίζεται σε μια μελλοντική έκδοση της εφαρμογής.</string>
+    <string name="unsupportedBarcodeType">Ο τύπος γραμμωτού κώδικα δεν μπορεί να εμφανιστεί ακόμα. Μπορεί να υποστηρίζεται σε μια μελλοντική έκδοση της εφαρμογής.</string>
     <string name="frontImageDescription">Μπροστινή εικόνα</string>
     <string name="photos">Φωτογραφίες</string>
     <string name="backImageDescription">Οπίσθια εικόνα</string>
-    <string name="updateBarcodeQuestionTitle">Ενημέρωση τιμής γραμμοκώδικα;</string>
+    <string name="updateBarcodeQuestionTitle">Ενημέρωση τιμής γραμμωτού κώδικα;</string>
     <string name="passwordRequired">Παρακαλώ εισάγετε τον κωδικό</string>
     <string name="sort_by_most_recently_used">Χρησιμοποιήθηκαν πρόσφατα</string>
     <string name="shortcutSelectCard">Επιλέξτε μία κάρτα</string>
-    <string name="barcodeImageDescriptionWithType">Εικόνα <xliff:g>%s</xliff:g> γραμμοκώδικα</string>
+    <string name="barcodeImageDescriptionWithType">Εικόνα <xliff:g>%s</xliff:g> γραμμωτού κώδικα</string>
     <string name="app_libraries">Ελεύθερες βιβλιοθήκες τρίτων: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="license">Άδεια</string>
     <string name="include_if_asking_support">Αν θέλετε να ζητήσετε υποστήριξη, συμπεριλάβετε τις ακόλουθες πληροφορίες:</string>
     <string name="importSuccessful">Δεδομένα εισήχθησαν</string>
     <string name="moveUp">Προχώρα πάνω</string>
-    <string name="barcodeType">Τύπος γραμμοκώδικα</string>
+    <string name="barcodeType">Τύπος γραμμωτού κώδικα</string>
     <string name="app_resources">Ελεύθερες πηγές τρίτων: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectColor">Επιλογή χρώματος</string>
     <string name="setIcon">Ορισμός εικονιδίου</string>
@@ -162,7 +162,7 @@
     <string name="exportSuccessful">Δεδομένα εξήχθησαν</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Αποτροπή κλειδώματος οθόνης</string>
     <string name="failedLaunchingPhotoPicker">Δεν βρέθηκε υποστηριζόμενη εφαρμογή συλλογής</string>
-    <string name="noBarcode">Χωρίς barcode</string>
+    <string name="noBarcode">Χωρίς γραμμωτό κώδικα</string>
     <string name="starImage">Αγαπημένο αστέρι</string>
     <string name="balanceSentence">Υπόλοιπο: <xliff:g>%s</xliff:g></string>
     <string name="failedParsingImportUriError">Δεν ήταν δυνατή η ανάλυση του εισαγόμενου URL</string>
@@ -173,7 +173,7 @@
     <string name="app_copyright_old">Βασισμένο στο Loyalty Card Keychain
 \nπνευματικά δικαιώματα © 2016-2020 Branden Archer</string>
     <string name="settings_follow_system_orientation">Ακολούθηση συστήματος</string>
-    <string name="settings_card_orientation">Προσανατολισμός γραμμοκώδικα</string>
+    <string name="settings_card_orientation">Προσανατολισμός γραμμωτού κώδικα</string>
     <string name="settings_portrait_orientation">Πορτραίτο</string>
     <string name="settings_landscape_orientation">Οριζόντια</string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Πνευματικά δικαιώματα © 2019-<xliff:g>%d</xliff:g> Sylvia van Os</string>
@@ -189,15 +189,15 @@
     <string name="leaveWithoutSaveConfirmation">Έξοδος χωρίς αποθήκευση;</string>
     <string name="expiryStateSentenceExpired">Έληξε: <xliff:g>%s</xliff:g></string>
     <string name="card">Κάρτα</string>
-    <string name="editBarcode">Επεξεργασία γραμμοκώδικα</string>
+    <string name="editBarcode">Επεξεργασία γραμμωτού κώδικα</string>
     <string name="chooseExpiryDate">Επιλέξτε ημερομηνία λήξης</string>
-    <string name="moveBarcodeToTopOfScreen">Μετακίνηση του γραμμοκώδικα στο πάνω μέρος της οθόνης</string>
-    <string name="noBarcodeFound">Δεν βρέθηκε γραμμοκώδικας</string>
+    <string name="moveBarcodeToTopOfScreen">Μετακίνηση του γραμμωτού κώδικα στο πάνω μέρος της οθόνης</string>
+    <string name="noBarcodeFound">Δεν βρέθηκε γραμμωτός κώδικα</string>
     <string name="balance">Υπόλοιπο</string>
     <string name="importCatima">Εισαγωγή από Catima</string>
     <string name="importStocard">Εισαγωγή από Stocard</string>
     <string name="importVoucherVault">Εισαγωγή από Voucher Vault</string>
-    <string name="sameAsCardId">Ίδιος κωδικός</string>
+    <string name="sameAsCardId">Όπως ο κωδικός</string>
     <string name="exportPassword">Προσθέστε έναν κωδικό για προστασία της εξαγωγής (προαιρετικά)</string>
     <string name="exportPasswordHint">Εισαγωγή κωδικού</string>
     <string name="failedGeneratingShareURL">Δεν ήταν δυνατή η δημιουργία κοινοποιούμενου URL. Παρακαλώ αναφέρετε το.</string>
@@ -207,7 +207,7 @@
     <string name="settings_oled_dark">Απόλυτο μαύρο φόντο για το μαύρο θέμα</string>
     <string name="settings_system_locale">Σύστημα</string>
     <string name="settings_theme_color">Χρώμα θέματος</string>
-    <string name="settings_catima_theme">Catima</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>
@@ -222,14 +222,14 @@
     <string name="archived">Η κάρτα αρχειοθετήθηκε</string>
     <string name="unarchived">Η κάρτα αφαιρέθηκε από το αρχείο</string>
     <string name="unarchive">Αφαίρεση από το αρχείο</string>
-    <string name="updateBalanceTitle">Πόσα ξοδέψατε;</string>
+    <string name="updateBalanceTitle">Πόσα ξοδέψατε ή λάβατε;</string>
     <string name="cameraPermissionDeniedTitle">Αδύνατη η πρόσβαση στην κάμερα</string>
     <string name="failedToRetrieveImageFile">Αποτυχία ανάκτησης αρχείου εικόνας</string>
     <string name="previousCard">Προηγούμενη</string>
     <string name="nextCard">Επόμενη</string>
     <string name="updateBalance">Ενημέρωση υπολοίπου</string>
     <string name="barcodeLongPressMessage">Μόνο εικόνες μπορούν να ανοιχτούν στην εφαρμογή φωτογραφιών</string>
-    <string name="noCameraPermissionDirectToSystemSetting">Για να σκανάρετε γραμμοκώδικες, θα χρειαστεί πρόσβαση στην κάμερα από το Catima. Πατήστε εδώ για να δώσετε πρόσβαση.</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Για να σκανάρετε γραμμωτούς κώδικες, θα χρειαστεί πρόσβαση στην κάμερα από το Catima. Πατήστε εδώ για να δώσετε πρόσβαση.</string>
     <plurals name="viewArchivedCardsWithCount">
         <item quantity="one">Προβολή αρχείου (<xliff:g>%1$d</xliff:g> κάρτας)</item>
         <item quantity="other">Προβολή αρχείου (<xliff:g>%1$d</xliff:g> καρτών)</item>
@@ -240,8 +240,60 @@
     <string name="newBalanceSentence">Νέο υπόλοιπο: <xliff:g>%s</xliff:g></string>
     <string name="failedToOpenUrl">Εγκαταστήστε έναν περιηγητή πρώτα</string>
     <string name="welcome">Καλώς ήρθατε στο Catima</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">Απενεργοποιεί το κλείδωμα οθόνης ενόσω βλέπετε μια κάρτα</string>
-    <string name="settings_display_barcode_max_brightness_summary">Απαραίτητο για να δουλέψει σε κάποια σκάνερ</string>
-    <string name="cameraPermissionRequired">Χρειάζεται άδεια για πρόσβαση στην κάμερα γι\' αυτή την ενέργεια…</string>
-    <string name="settings_allow_content_provider_read_title">Επιτρέπει σε άλλες εφαρμογές να έχουν πρόσβαση στα δεδομένα μου</string>
+    <string name="settings_disable_lockscreen_while_viewing_card_summary">Απενεργοποιεί το κλείδωμα οθόνης κατά την προβολή μιας κάρτας</string>
+    <string name="settings_display_barcode_max_brightness_summary">Απαραίτητο για να δουλέψει σε κάποιους σαρωτές</string>
+    <string name="cameraPermissionRequired">Δικαίωμα πρόσβασης στην κάμερα απαραίτητο γι\' αυτή την ενέργεια…</string>
+    <string name="settings_allow_content_provider_read_title">Να επιτρέπεται σε άλλες εφαρμογές να έχουν πρόσβαση στα δεδομένα μου</string>
+    <string name="app_copyright_short">Πνευματικά δικαιώματα © Sylvia van Os και συνεργάτες</string>
+    <string name="height">Ύψος:</string>
+    <string name="switchToFrontImage">Μετάβαση στην μπροστινή εικόνα</string>
+    <string name="switchToBackImage">Μετάβαση στην οπίσθια εικόνα</string>
+    <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="settings_follow_sensor_orientation">Πάντα σε περιστροφή (αγνοεί τις ρυθμίσεις του συστήματος)</string>
+    <string name="validFromDate">Ισχύει από</string>
+    <string name="anyDate">Οποιαδήποτε ημερομηνία</string>
+    <string name="chooseValidFromDate">Επιλέξτε έγκυρη ημερομηνία από</string>
+    <string name="setBarcodeHeight">Ρυθμίστε το ύψος του γραμμωτού κώδικα</string>
+    <string name="show_name_below_image_thumbnail">Εμφάνιση ονόματος κάτω από το εικονίδιο</string>
+    <string name="app_name">Catima</string>
+    <string name="balanceParsingFailed">Μη έγκυρο υπόλοιπο</string>
+    <string name="continue_">Συνέχεια</string>
+    <string name="settings_category_title_privacy">Απόρρητο</string>
+    <string name="addFromPdfFile">Επιλογή αρχείου PDF</string>
+    <string name="add_manually_warning_message">Για ορισμένα καταστήματα, ο γραμμωτός κώδικας διαφέρει από τον αριθμό που αναγράφεται πάνω στην κάρτα. Εξαιτίας αυτού, η εισαγωγή γραμμωτού κώδικα χειροκίνητα ενδέχεται να μην λειτουργεί πάντα. Προτείνεται να σκανάρετε τον γραμμωτό κώδικα με χρήση της κάμερας. Επιθυμείτε να συνεχίσετε ;</string>
+    <string name="amountParsingFailed">Μη έγκυρο ποσό</string>
+    <string name="show_balance">Προβολή υπολοίπου</string>
+    <string name="action_display_options">Επιλογές εμφάνισης</string>
+    <string name="settings_category_title_cards">Κάρτες</string>
+    <string name="settings_category_title_general">Γενικά</string>
+    <string name="show_archived_cards">Προβολή αρχειοθετημένων καρτών</string>
+    <string name="addWithoutBarcode">Προσθήκη κάρτας χωρίς γραμμωτό κώδικα</string>
+    <string name="view_online">Προβολή διαδικτυακά</string>
+    <string name="errorReadingFile">Δεν ήταν δυνατή η ανάγνωση του αρχείου</string>
+    <string name="failedLaunchingFileManager">Δεν ήταν δυνατή η εύρεση υποστηριζόμενου διαχειριστή αρχείων</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Ποιους από τους γραμμωτούς κώδικες που βρέθηκαν θέλετε να χρησιμοποιήσετε;</string>
+    <string name="pageWithNumber">Σελίδα <xliff:g>%d</xliff:g></string>
+    <string name="spend">Δαπάνησε</string>
+    <string name="receive">Λήψη</string>
+    <string name="settings_keep_screen_on_summary">Απενεργοποιεί το χρονικό όριο της οθόνης κατά την προβολή μιας κάρτας</string>
+    <string name="settings_oled_dark_summary">Μειώνει τη χρήση της μπαταρίας στις οθόνες OLED</string>
+    <string name="show_note">Εμφάνιση σημείωσης</string>
+    <string name="action_more_options">Περισσότερες επιλογές</string>
+    <string name="enter_card_id">Εισαγάγετε τον κωδικό αριθμό ή το κείμενο στην κάρτα σας</string>
+    <string name="show_validity">Εμφάνιση εγκυρότητας</string>
+    <string name="add_a_card_in_a_different_way">Προσθέστε μια κάρτα με διαφορετικό τρόπο</string>
+    <string name="card_id_must_not_be_empty">Ο κωδικός αριθμός της κάρτας δεν πρέπει να είναι κενός</string>
+    <string name="settings_allow_content_provider_read_summary">Οι εφαρμογές θα πρέπει ακόμα να ζητήσουν άδεια για να τους δοθεί πρόσβαση</string>
+    <string name="field_must_not_be_empty">Το πεδίο δεν πρέπει να είναι κενό</string>
+    <string name="manually_enter_barcode_instructions">Εισαγάγετε τον κωδικό αριθμό ή το κείμενο στην κάρτα σας και πατήστε τον γραμμωτό κώδικα που μοιάζει με αυτόν της κάρτας σας.</string>
+    <string name="add_manually_warning_title">Συνιστάται η σάρωση</string>
+    <string name="noCameraFoundGuideText">Η συσκευή σας δεν φαίνεται να διαθέτει κάμερα. Αν έχει, δοκιμάστε να κάνετε επανεκκίνηση της συσκευής. Διαφορετικά, χρησιμοποιήστε το κουμπί Περισσότερες επιλογές παρακάτω για να προσθέσετε έναν γραμμωτό κώδικα με άλλο τρόπο.</string>
 </resources>

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

@@ -70,7 +70,7 @@
     <string name="backImageDescription">Imágen dorsal</string>
     <string name="noCameraPermissionDirectToSystemSetting">Para escanear códigos de barra, Catima necesitará acceso a la cámara. Presione aquí para cambiar la configuración de sus permisos.</string>
     <string name="settings_lock_on_opening_orientation">Bloquear a la orientación utilizada al abrir la tarjeta</string>
-    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="app_loyalty_card_keychain">Cartera para Tarjetas de Fidelización</string>
     <string name="importOptionFilesystemTitle">Importar desde su sistema de archivos</string>
     <string name="leaveWithoutSaveTitle">Salir</string>
     <string name="expiryStateSentence">Expira: <xliff:g>%s</xliff:g></string>
@@ -184,4 +184,37 @@
     <string name="settings_keep_screen_on_summary">Deshabilita el tiempo de espera de la pantalla mientras se ve una tarjeta</string>
     <string name="thumbnailDescription">Miniatura</string>
     <string name="deleteConfirmationGroup">¿Eliminar grupo\?</string>
+    <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">Agregar una contraseña para protejer tu exportación (opcional)</string>
+    <string name="settings_sky_blue_theme">Celeste</string>
+    <string name="settings_green_theme">Verde</string>
+    <string name="settings_grey_theme">Gris</string>
+    <string name="exportPasswordHint">Ingresar contraseña</string>
+    <string name="setIcon">Establecer miniatura</string>
+    <string name="showMoreInfo">Mostrar información</string>
+    <string name="turn_flashlight_on">Encender linterna</string>
+    <string name="turn_flashlight_off">Apagar linterna</string>
+    <string name="updateBalance">Actualizar balance</string>
+    <string name="failedToRetrieveImageFile">Error al obtener archivo de imagen</string>
+    <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="settings_follow_sensor_orientation">Siempre rotar (ignora configuración del sistema)</string>
+    <string name="yes">Si</string>
+    <string name="no">No</string>
+    <string name="passwordRequired">Por favor ingresa la contraseña</string>
+    <string name="failedGeneratingShareURL">No se pudo generar URL compartible. Por favor reporte esto.</string>
+    <string name="sort_by_name">Nombre</string>
 </resources>

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

@@ -4,7 +4,7 @@
     <string name="noGiftCards">Haz clic en el botón + para añadir una tarjeta, o importa desde el menú ⋮.</string>
     <string name="storeName">Nombre</string>
     <string name="note">Nota</string>
-    <string name="cardId">ID. de tarjeta</string>
+    <string name="cardId">ID de tarjeta</string>
     <string name="cancel">Cancelar</string>
     <string name="save">Guardar</string>
     <string name="edit">Editar</string>
@@ -20,7 +20,7 @@
     <string name="noCardExistsError">No se ha podido encontrar esa tarjeta</string>
     <string name="importExport">Importar/Exportar</string>
     <string name="exportName">Exportar</string>
-    <string name="importExportHelp">Hacer una copia de seguridad de los datos permite trasladarlos a otro dispositivo.</string>
+    <string name="importExportHelp">Respaldar tus datos permite trasladarlos a otro dispositivo.</string>
     <string name="importSuccessfulTitle">Importado</string>
     <string name="importFailedTitle">Falló la importación</string>
     <string name="importFailed">No se ha podido realizar la importación</string>
@@ -33,9 +33,9 @@
     <string name="importOptionFilesystemExplanation">Elegir un archivo concreto del sistema de archivos.</string>
     <string name="importOptionFilesystemButton">Desde el sistema de archivos</string>
     <string name="importOptionApplicationTitle">Utilizar otra aplicación</string>
-    <string name="importOptionApplicationExplanation">Use una aplicación o su gestor de archivos favoritos para abrir un archivo.</string>
+    <string name="importOptionApplicationExplanation">Usa cualquier aplicación o tu administrador de archivos favorito para abrir un archivo.</string>
     <string name="importOptionApplicationButton">Utilizar otra aplicación</string>
-    <string name="about">Acerca de</string>
+    <string name="about">Información</string>
     <string name="app_license">Programa libre con «copyleft», disponible en virtud de la licencia GPLv3+</string>
     <string name="about_title_fmt">Acerca de <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versión: <xliff:g id="version">%s</xliff:g></string>
@@ -56,16 +56,16 @@
     <string name="barcodeType">Tipo de código de barras</string>
     <string name="noMatchingGiftCards">Sin resultados. Intente cambiar su búsqueda.</string>
     <string name="action_search">Buscar</string>
-    <string name="noGroups">Pulse en el botón «+» para añadir grupos de categorización.</string>
+    <string name="noGroups">Pulse en el botón + para añadir grupos de categorización.</string>
     <string name="starImage">Estrella favorita</string>
     <string name="thumbnailDescription">Miniatura</string>
     <string name="selectBarcodeTitle">Seleccionar el código de barras</string>
     <string name="unstar">Eliminar de favoritos</string>
     <string name="noBarcode">Sin código de barras</string>
-    <string name="enter_group_name">Introducir nombre del grupo</string>
+    <string name="enter_group_name">Escribe el nombre del grupo</string>
     <string name="groups">Grupos</string>
     <string name="groupsList">Grupos: <xliff:g>%s</xliff:g></string>
-    <string name="addManually">Introducir manualmente el código de barras</string>
+    <string name="addManually">Escribe manualmente el código de barras</string>
     <string name="leaveWithoutSaveConfirmation">¿Quiere abandonar sin guardar\?</string>
     <string name="leaveWithoutSaveTitle">Salir</string>
     <string name="moveDown">Bajar</string>
@@ -115,7 +115,7 @@
     <string name="removeImage">Quitar imagen</string>
     <string name="setFrontImage">Establecer imagen frontal</string>
     <string name="photos">Fotos</string>
-    <string name="backImageDescription">Imagen del reverso</string>
+    <string name="backImageDescription">Imagen de atrás</string>
     <string name="frontImageDescription">Imagen frontal</string>
     <string name="wrongValueForBarcodeType">El valor no es válido para el tipo de código de barras seleccionado</string>
     <string name="unsupportedBarcodeType">Este tipo de código de barras todavía no se puede visualizar. Es posible que se admita en una futura versión de la aplicación.</string>
@@ -184,10 +184,10 @@
     <string name="settings_portrait_orientation">Formato vertical</string>
     <string name="group_edit">Editar grupo</string>
     <string name="group_updated">Grupo actualizado</string>
-    <string name="noGiftCardsGroup">Cree algunas tarjetas y luego asígnelas al grupo aquí.</string>
-    <string name="settings_follow_system_orientation">Seguir el sistema</string>
+    <string name="noGiftCardsGroup">Crea algunas tarjetas y luego asígnelas al grupo aquí.</string>
+    <string name="settings_follow_system_orientation">Segue el sistema</string>
     <string name="settings_lock_on_opening_orientation">Bloqueo a la orientación utilizada al abrir la tarjeta</string>
-    <string name="sort_by_most_recently_used">Lo más reciente que se ha utilizado</string>
+    <string name="sort_by_most_recently_used">Lo más usado recientemente</string>
     <string name="sort_by_expiry">Caducidad</string>
     <string name="version_history">Historial de versiones</string>
     <string name="help_translate_this_app">Ayuda a traducir esta aplicación</string>
@@ -199,7 +199,7 @@
     <string name="sort_by_name">Nombre</string>
     <string name="license">Licencia</string>
     <string name="source_repository">Repositorio de fuente</string>
-    <string name="on_github">En GitHub</string>
+    <string name="on_github">en GitHub</string>
     <string name="on_google_play">en Google Play</string>
     <string name="report_error">Informar de un error</string>
     <string name="translate_platform">en Weblate</string>
@@ -230,7 +230,7 @@
     <string name="archived">Tarjeta archivada</string>
     <string name="unarchived">Tarjeta desarchivada</string>
     <string name="exportPassword">Establezca una contraseña para proteger su exportación (opcional)</string>
-    <string name="failedLaunchingPhotoPicker">No se ha podido encontrar una aplicación de galería compatible</string>
+    <string name="failedLaunchingPhotoPicker">No se ha encontró una aplicación de galería compatible</string>
     <plurals name="groupCardCountWithArchived">
         <item quantity="one"><xliff:g>%1$d</xliff:g> tarjeta (archivada)<xliff:g id="archivedCount">%2$d</xliff:g></item>
         <item quantity="many"><xliff:g>%1$d</xliff:g> tarjetas (archivadas)<xliff:g id="archivedCount">%2$d</xliff:g></item>
@@ -239,7 +239,7 @@
     <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\?</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="updateBalanceHint">Introduzca el importe</string>
@@ -291,4 +291,16 @@
     <string name="field_must_not_be_empty">Este campo no debe estar vacío</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Girar siempre (ignora la configuración del sistema)</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="spend">Gastar</string>
+    <string name="receive">Recibió</string>
+    <string name="amountParsingFailed">Importe incorrecto</string>
+    <string name="addFromPdfFile">Seleccionar un archivo PDF</string>
+    <string name="errorReadingFile">No se ha podido leer el archivo</string>
+    <string name="failedLaunchingFileManager">No se ha podido encontrar un gestor de archivos compatible</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">¿Cuál de los códigos de barras encontrados desea utilizar?</string>
+    <string name="pageWithNumber">Página <xliff:g>%d</xliff:g></string>
+    <string name="noCameraFoundGuideText">Tu dispositivo no parece tener cámara. Si la tiene, intente reiniciar el dispositivo. De lo contrario, utilice el botón Más opciones a continuación para añadir un código de barras de otra manera.</string>
 </resources>

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

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

@@ -228,7 +228,7 @@
         <item quantity="one">Näytä arkisto (<xliff:g>%1$d</xliff:g> kortti)</item>
         <item quantity="other">Näytä arkisto (<xliff:g>%1$d</xliff:g> korttia)</item>
     </plurals>
-    <string name="updateBalanceTitle">Kuinka paljon kulutit\?</string>
+    <string name="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>
@@ -283,4 +283,16 @@
     <string name="app_name">Catima</string>
     <string name="balanceParsingFailed">Virheellinen saldo</string>
     <string name="view_online">Näytä verkossa</string>
+    <string name="settings_follow_sensor_orientation">Kierrä aina (ohittaa järjestelmän asetukset)</string>
+    <string name="continue_">Jatka</string>
+    <string name="add_manually_warning_title">Skannausta suositellaan</string>
+    <string name="spend">Kuluta</string>
+    <string name="receive">Vastaanota</string>
+    <string name="amountParsingFailed">Virheellinen määrä</string>
+    <string name="add_manually_warning_message">Joidenkin kauppojen kohdalla viivakoodin arvo eroaa kortilla olevasta numerosta. Tämän takia viivakoodin syöttäminen käsin ei aina toimi. On vahvasti suositeltua skannata viivakoodi kameralla. Haluatko silti jatkaa?</string>
+    <string name="addFromPdfFile">Valitse PDF-tiedosto</string>
+    <string name="errorReadingFile">Tiedostoa ei voitu lukea</string>
+    <string name="failedLaunchingFileManager">Tuettua tiedostonhallintasovellusta ei löytynyt</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Mitä löytyneistä viivakoodeista haluat käyttää?</string>
+    <string name="pageWithNumber">Sivu <xliff:g>%d</xliff:g></string>
 </resources>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_search">Hanap</string>
+    <string name="app_name">Catima</string>
+</resources>

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

@@ -95,9 +95,9 @@
     <string name="expiryDate">Date d’expiration</string>
     <string name="editBarcode">Modifier le code-barres</string>
     <string name="card">Carte</string>
-    <string name="balanceSentence">Solde : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-    <string name="expiryStateSentenceExpired">Expiré : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-    <string name="expiryStateSentence">Expire : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="balanceSentence">Solde : <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Expiré le : <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Expire le : <xliff:g>%s</xliff:g></string>
     <string name="settings_disable_lockscreen_while_viewing_card">Empêcher le verrouillage de l’écran</string>
     <string name="settings_keep_screen_on">Garder l’écran allumé</string>
     <string name="importVoucherVaultMessage">Sélectionnez votre exportation <i>vouchervault.json</i> de Voucher Vault à importer.
@@ -243,7 +243,7 @@
     <string name="cameraPermissionDeniedTitle">Impossible d’accéder à la caméra</string>
     <string name="noCameraPermissionDirectToSystemSetting">Pour scanner les codes-barres, Catima doit avoir accès à votre caméra. Tapez ici pour modifier vos paramètres d\'autorisation.</string>
     <string name="updateBalance">Mettre à jour le solde</string>
-    <string name="updateBalanceTitle">Combien avez-vous dépensé \?</string>
+    <string name="updateBalanceTitle">Combien avez-vous dépensé ou reçu ?</string>
     <string name="newBalanceSentence">Nouveau solde : <xliff:g>%s</xliff:g></string>
     <string name="importCards">Importer des cartes</string>
     <string name="storageReadPermissionRequired">L’autorisation de lire le stockage est nécessaire pour cette action…</string>
@@ -291,4 +291,16 @@
     <string name="field_must_not_be_empty">Le champ ne peut pas être vide</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Toujours pivoter (ignore les paramètres du système)</string>
+    <string name="add_manually_warning_title">Scan recommandé</string>
+    <string name="continue_">Continuer</string>
+    <string name="add_manually_warning_message">Pour certains magasins, la valeur du code-barres diffère du numéro inscrit sur la carte. Pour cette raison, la saisie manuelle d’un code-barres peut ne pas toujours fonctionner. Il est fortement recommandé de scanner le code-barres avec votre appareil photo. Voulez-vous toujours continuer ?</string>
+    <string name="spend">Dépenser</string>
+    <string name="receive">Reçevoir</string>
+    <string name="amountParsingFailed">Montant Invalide</string>
+    <string name="addFromPdfFile">Sélectionner un fichier PDF</string>
+    <string name="errorReadingFile">Lecture du fichier impossible</string>
+    <string name="failedLaunchingFileManager">Impossible de trouver un gestionnaire de fichiers supporté</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Quel code-barre, parmi ceux trouvés, voulez-vous utiliser ?</string>
+    <string name="pageWithNumber">Page <xliff:g>%d</xliff:g></string>
+    <string name="noCameraFoundGuideText">Votre appareil ne semble pas disposer d\'une caméra. Si c\'est le cas, veuillez essayer de redémarrer l\'appareil. Sinon, vous pouvez utiliser le bouton \"Plus d\'options\" ci-dessous pour ajouter un code-barre d\'une autre manière.</string>
 </resources>

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

@@ -70,7 +70,7 @@
     <string name="noBarcode">बारकोड नहीं है</string>
     <string name="scanCardBarcode">बारकोड स्कैन करें</string>
     <string name="cardShortcut">कार्ड का सरल उपाय (शॉर्टकट)</string>
-    <string name="noGiftCards">\"+\" बटन दबाके कार्ड जोड़ें वा मेन्यू से कार्ड आयात करें</string>
+    <string name="noGiftCards">कार्ड जोड़ने के लिए + प्लस बटन पर क्लिक करें, या ⋮ मेनू से आयात करें।</string>
     <string name="importExportHelp">तथ्य (डाटा) को बैकअप करना हमें उसे दूसरे डिवाइस में भेजने देता है।</string>
     <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> का बारकोड</string>
     <string name="settings_disable_lockscreen_while_viewing_card">स्क्रीन को लॉक होने से रोकें</string>
@@ -107,7 +107,7 @@
     <string name="exportSuccessful">डेटा निर्यात किया गया</string>
     <string name="groupsList">समूह: <xliff:g>%s</xliff:g></string>
     <plurals name="balancePoints">
-        <item quantity="one"><xliff:g>%s</xliff:g> अंक</item>
+        <item quantity="one"><xliff:g>%s</xliff:g> बिंदु</item>
         <item quantity="other"><xliff:g>%s</xliff:g> अंक</item>
     </plurals>
     <string name="privacy_policy_popup_text">निजता नीति नोटिस (कुछ ऐप स्टोर के लिए आवश्यक):
@@ -117,7 +117,7 @@
 \nदूसरे Catima ऍप के आयात/निर्यात मेनू से निर्यात बटन दबाकर, पहले catima.zip फाइल को बनाये.</string>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> चयनित</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> चयनित.</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> चयनित</item>
     </plurals>
     <string name="groups">समूहों</string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">कॉपीराइट © 2019–<xliff:g>%d</xliff:g> Sylvia van Os और योगदाता</string>
@@ -214,4 +214,86 @@
     <string name="show_balance">मात्रा दिखाओ</string>
     <string name="nextCard">अगला</string>
     <string name="rate_this_app">इस ऐप को रेट करें</string>
+    <string name="settings_system_locale">सिस्टम</string>
+    <string name="setIcon">थंबनेल सेट करें</string>
+    <string name="sort_by_expiry">समाप्ति</string>
+    <string name="sort_by">इसके अनुसार क्रमबद्ध करें</string>
+    <string name="importCards">कार्ड आयात करें</string>
+    <string name="add_a_card_in_a_different_way">कार्ड को भिन्न तरीके से जोड़ें</string>
+    <string name="settings_locale">भाषा</string>
+    <string name="settings_oled_dark">गहरे रंग की थीम के लिए शुद्ध काले रंग की पृष्ठभूमि</string>
+    <string name="selectColor">रंग चुनो</string>
+    <string name="app_contributors">इसके द्वारा संभव बनाया गया: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="sort">क्रमबद्ध करें</string>
+    <string name="show_note">नोट दिखाएँ</string>
+    <string name="settings_follow_sensor_orientation">हमेशा घुमाएँ (सिस्टम सेटिंग्स को अनदेखा करता है)</string>
+    <string name="importFidmeMessage">आयात करने के लिए FidMe से अपना <i>fidme-export-request-xxxxxx.zip</i> निर्यात चुनें, और बाद में मैन्युअल रूप से बारकोड प्रकार चुनें।
+\nडेटा सुरक्षा चुनकर और फिर पहले मेरा डेटा निकालें दबाकर इसे अपनी FidMe प्रोफ़ाइल से बनाएं।</string>
+    <string name="importLoyaltyCardKeychainMessage">आयात करने के लिए लॉयल्टी कार्ड कीचेन से अपना <i>LoyaltyCardKeychen.csv</i> निर्यात चुनें।
+\nपहले वहां एक्सपोर्ट दबाकर लॉयल्टी कार्ड कीचेन में आयात/निर्यात मेनू से इसे बनाएं।</string>
+    <string name="updateBarcodeQuestionText">आपने आईडी बदल दी. क्या आप समान मान का उपयोग करने के लिए बारकोड को भी अपडेट करना चाहते हैं?</string>
+    <string name="exportPassword">अपने निर्यात की सुरक्षा के लिए एक पासवर्ड सेट करें (वैकल्पिक)</string>
+    <string name="turn_flashlight_off">टॉर्च बंद करें</string>
+    <string name="settings_oled_dark_summary">OLED डिस्प्ले पर बैटरी का उपयोग कम होता है</string>
+    <string name="showMoreInfo">जानकारी दिखाएँ</string>
+    <string name="updateBalance">शेष राशि अद्यतन करें</string>
+    <string name="failedToRetrieveImageFile">छवि फ़ाइल पुनः प्राप्त करने में विफल</string>
+    <string name="version_history">संस्करण इतिहास</string>
+    <string name="archive">पुरालेख</string>
+    <string name="archived">कार्ड संग्रहीत</string>
+    <string name="barcodeLongPressMessage">गैलरी ऐप में केवल छवियां ही खोली जा सकती हैं</string>
+    <string name="license">परवाना</string>
+    <string name="source_repository">स्रोत रिपोजिटरी</string>
+    <string name="include_if_asking_support">यदि आप सहायता का अनुरोध करना चाहते हैं, तो निम्नलिखित जानकारी शामिल करें:</string>
+    <string name="starred">तारांकित</string>
+    <string name="unarchived">कार्ड अनारक्षित</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> कार्ड (<xliff:g id="archivedCount">%2$d</xliff:g> संग्रहीत)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> कार्ड (<xliff:g id="archivedCount">%2$d</xliff:g> संग्रहीत)</item>
+    </plurals>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">संग्रह देखें (<xliff:g>%1$d</xliff:g> कार्ड)</item>
+        <item quantity="other">संग्रह देखें (<xliff:g>%1$d</xliff:g> कार्ड)</item>
+    </plurals>
+    <string name="updateBalanceTitle">आपने कितना खर्च या प्राप्त किया?</string>
+    <string name="chooseValidFromDate">दिनांक से वैध चुनें</string>
+    <string name="show_name_below_image_thumbnail">छवि थंबनेल के नीचे नाम दिखाएँ</string>
+    <string name="show_archived_cards">संग्रहीत कार्ड दिखाएँ</string>
+    <string name="manually_enter_barcode_instructions">अपने कार्ड पर आईडी नंबर या टेक्स्ट दर्ज करें और अपने कार्ड पर मौजूद बारकोड की तरह दिखने वाले बारकोड को दबाएं।</string>
+    <string name="welcome">कैटिमा में आपका स्वागत है</string>
+    <string name="previousCard">पिछला</string>
+    <string name="failedLaunchingPhotoPicker">कोई समर्थित गैलरी ऐप नहीं मिल सका</string>
+    <string name="reverse">...उल्टे क्रम में</string>
+    <string name="height">ऊंचाई:</string>
+    <string name="importVoucherVaultMessage">आयात करने के लिए वाउचर वॉल्ट से अपना <i>vouchervault.json</i> निर्यात चुनें।
+\nसबसे पहले वाउचर वॉल्ट में एक्सपोर्ट दबाकर इसे बनाएं।</string>
+    <string name="turn_flashlight_on">टॉर्च चालू करें</string>
+    <string name="sort_by_name">नाम</string>
+    <string name="credits">श्रेय</string>
+    <string name="unarchive">असंग्रहित</string>
+    <string name="failedToOpenUrl">सबसे पहले एक वेब ब्राउज़र इंस्टॉल करें</string>
+    <string name="currentBalanceSentence">वर्तमान शेष: <xliff:g>%s</xliff:g></string>
+    <string name="newBalanceSentence">नया शेष: <xliff:g>%s</xliff:g></string>
+    <string name="validFromDate">से मान्य</string>
+    <string name="validFromSentence">यहां से मान्य: <xliff:g>%s</xliff:g></string>
+    <string name="switchToFrontImage">सामने वाली छवि पर स्विच करें</string>
+    <string name="switchToBackImage">पिछली छवि पर स्विच करें</string>
+    <string name="switchToBarcode">बारकोड पर स्विच करें</string>
+    <string name="openFrontImageInGalleryApp">गैलरी ऐप में सामने वाली छवि खोलें</string>
+    <string name="openBackImageInGalleryApp">गैलरी ऐप में पिछली छवि खोलें</string>
+    <string name="setBarcodeHeight">बारकोड ऊंचाई सेट करें</string>
+    <string name="icon_header_click_text">थंबनेल संपादित करने के लिए देर तक दबाएँ</string>
+    <string name="enter_card_id">अपने कार्ड पर आईडी नंबर या पाठ दर्ज करें</string>
+    <string name="continue_">जारी रखें</string>
+    <string name="add_manually_warning_message">कुछ दुकानों के लिए, बारकोड का मान कार्ड पर लिखे नंबर से भिन्न होता है। इस वजह से, बारकोड को मैन्युअल रूप से दर्ज करना हमेशा काम नहीं कर सकता है। इसके बजाय बारकोड को अपने कैमरे से स्कैन करने की पुरजोर अनुशंसा की जाती है। क्या आप अब भी जारी रखना चाहते हैं?</string>
+    <string name="add_manually_warning_title">स्कैनिंग की अनुशंसा की जाती है</string>
+    <string name="spend">खर्च किया</string>
+    <string name="receive">प्राप्त किया</string>
+    <string name="amountParsingFailed">अमान्य राशि</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">आप पाए गए बारकोड में से कौन सा उपयोग करना चाहते हैं?</string>
+    <string name="pageWithNumber">पृष्ठ <xliff:g>%d</xliff:g></string>
+    <string name="addFromPdfFile">एक PDF फाइल चुनें</string>
+    <string name="errorReadingFile">फाइल को पढ़ा नहीं जा सका</string>
+    <string name="failedLaunchingFileManager">समर्थित फाइल प्रबंधक नहीं मिल सका</string>
+    <string name="noCameraFoundGuideText">ऐसा लगता है कि आपके डिवाइस में कैमरा नहीं है। अगर है, तो डिवाइस को रीबूट करने का प्रयास करें। अन्यथा, किसी अन्य तरीके से बारकोड जोड़ने के लिए नीचे दिए गए अधिक विकल्प बटन का उपयोग करें।</string>
 </resources>

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

@@ -252,7 +252,7 @@
     <string name="shortcutSelectCard">Odaberi karticu</string>
     <string name="previousCard">Prethodna</string>
     <string name="nextCard">Sljedeća</string>
-    <string name="updateBalanceTitle">Koliko si potrošio/la\?</string>
+    <string name="updateBalanceTitle">Koliko si potrošio/la ili primio/la?</string>
     <string name="updateBalanceHint">Upiši iznos</string>
     <string name="about_title_fmt">Informaije o <xliff:g id="app_name">%s</xliff:g></string>
     <string name="failedToOpenUrl">Najprije instaliraj web preglednik</string>
@@ -291,4 +291,15 @@
     <string name="settings_keep_screen_on_summary">Deaktivira isključivanje ekrana tijekom prikaza kartice</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Uvijek rotiraj (ignorira sistemske postavke)</string>
+    <string name="continue_">Nastavi</string>
+    <string name="add_manually_warning_message">Za neke trgovine se vrijednost barkoda razlikuje od broja napisanog na kartici. Zbog toga ručni unos barkoda možda neće uvijek funkcionirati. Preporučuje se snimanje barkoda pomoću kamere. Želiš li svejedno nastaviti?</string>
+    <string name="add_manually_warning_title">Preporučuje se snimanje</string>
+    <string name="addFromPdfFile">Odaberi PDF datoteku</string>
+    <string name="errorReadingFile">Neuspjelo čitanje datoteke</string>
+    <string name="failedLaunchingFileManager">Nije pronađen podržani upravljač datoteka</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Koji pronađeni barkod želiš koristiti?</string>
+    <string name="pageWithNumber">Stranica <xliff:g>%d</xliff:g></string>
+    <string name="spend">Potroši</string>
+    <string name="receive">Primi</string>
+    <string name="amountParsingFailed">Neispravan iznos</string>
 </resources>

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

@@ -226,7 +226,7 @@
     <string name="currentBalanceSentence">Jelenlegi egyenleg: <xliff:g>%s</xliff:g></string>
     <string name="updateBalanceHint">Adja meg az összeget</string>
     <string name="importCards">Kártyák importálása</string>
-    <string name="updateBalanceTitle">Mennyit költött\?</string>
+    <string name="updateBalanceTitle">Mennyit költött és kapott?</string>
     <string name="newBalanceSentence">Új egyenleg: <xliff:g>%s</xliff:g></string>
     <string name="cameraPermissionDeniedTitle">Nem sikerült hozzáférni a kamerához</string>
     <string name="failedToRetrieveImageFile">Nem sikerült lekérni a képfájlt</string>
@@ -284,4 +284,16 @@
     <string name="show_archived_cards">Archivált kártyák megjelenítése</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Mindig forgassa (figyelmen kívül hagyja a rendszerbeállításokat)</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="continue_">Tovább</string>
+    <string name="spend">Költött</string>
+    <string name="receive">Megkapott</string>
+    <string name="addFromPdfFile">PDF fájl kiválasztása</string>
+    <string name="errorReadingFile">A fájl nem olvasható</string>
+    <string name="pageWithNumber"><xliff:g>%d</xliff:g>. oldal</string>
+    <string name="failedLaunchingFileManager">Nem található támogatott fájlkezelő</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">A talált vonalkódok közül melyiket szeretné használni?</string>
+    <string name="noCameraFoundGuideText">Úgy tűnik, az eszközén nincs kamera. Ha van, próbálja meg újraindítani az eszközt. Másképp, használja a További beállítások gombot alul, hogy máshogy hozzáadjon egy vonalkódot.</string>
 </resources>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="storeName">Nama</string>
     <string name="note">Keterangan</string>
     <string name="delete">Hapus</string>
@@ -141,17 +141,17 @@
 \nTIDAK ADA DATA YANG DIKUMPULKAN SAMA SEKALI, yang dapat dikonfirmasi oleh siapa pun karena aplikasi kami adalah libre software.</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. 
+    <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="importLoyaltyCardKeychain">Impor dari Loyalty Card Keychain</string>
-    <string name="importLoyaltyCardKeychainMessage">Pilih ekspor <i>LoyaltyCardKeychain.csv</i> Anda dari Loyalty Card Keychain untuk diimpor. 
+    <string name="importLoyaltyCardKeychainMessage">Pilih ekspor <i>LoyaltyCardKeychain.csv</i> Anda dari Loyalty Card Keychain untuk diimpor.
 \nBuat dari menu Import/Export di Loyalty Card Keychain dengan menekan Export terlebih dahulu.</string>
     <string name="importStocard">Impor dari Stocard</string>
-    <string name="importStocardMessage">Pilih ekspor <i>***.zip</i> Anda dari Stocard untuk diimpor. 
+    <string name="importStocardMessage">Pilih ekspor <i>***.zip</i> Anda dari Stocard untuk diimpor.
 \nDapatkan dengan mengirim email ke support@stocardapp.com untuk meminta ekspor data Anda.</string>
     <string name="importVoucherVault">Impor dari Voucher Vault</string>
-    <string name="importVoucherVaultMessage">Pilih ekspor <i>vouchervault.json</i> Anda dari Vault Voucher untuk diimpor. 
-\nBuat dengan menekan Ekspor di Vault Voucher terlebih dahulu.</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="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="frontImageDescription">Gambar depan</string>
@@ -231,7 +231,7 @@
     <string name="updateBalance">Perbarui saldo</string>
     <string name="updateBalanceHint">Masukkan jumlah</string>
     <string name="currentBalanceSentence">Saldo saat ini: <xliff:g>%s</xliff:g></string>
-    <string name="updateBalanceTitle">Berapa banyak yang telah kamu habiskan \?</string>
+    <string name="updateBalanceTitle">Berapa banyak yang kamu belanjakan atau terima?</string>
     <string name="noCameraPermissionDirectToSystemSetting">Untuk memindai barcode, Catima membutuhkan akses ke kamera mu. Tap disini untuk mengganti pengaturan perizinan mu.</string>
     <string name="cameraPermissionRequired">Berikan izin untuk mengakses kamera anda…</string>
     <string name="storageReadPermissionRequired">Berikan izin untuk membaca penyimpanan anda…</string>
@@ -277,4 +277,16 @@
     <string name="field_must_not_be_empty">Isian tidak boleh kosong</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Selalu rotasi (abaikan pengaturan sistem)</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="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="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>
 </resources>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+<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="action_search">Leita að</string>

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

@@ -241,7 +241,7 @@
     <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\?</string>
+    <string name="updateBalanceTitle">Quanto hai speso o ricevuto?</string>
     <string name="updateBalanceHint">Inserisci l\'importo</string>
     <string name="currentBalanceSentence">Bilancio attuale: <xliff:g>%s</xliff:g></string>
     <string name="newBalanceSentence">Nuovo bilancio: <xliff:g>%s</xliff:g></string>
@@ -291,4 +291,16 @@
     <string name="field_must_not_be_empty">Il campo non deve essere vuoto</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Ruota sempre (ignora le impostazioni di sistema)</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="amountParsingFailed">Importo non valido</string>
+    <string name="spend">Spendi</string>
+    <string name="receive">Ricevi</string>
+    <string name="errorReadingFile">Impossibile leggere il file</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Quale dei codici a barre trovati vuoi utilizzare?</string>
+    <string name="addFromPdfFile">Seleziona un file PDF</string>
+    <string name="failedLaunchingFileManager">Impossibile trovare un file manager supportato</string>
+    <string name="pageWithNumber">Pagina <xliff:g>%d</xliff:g></string>
+    <string name="noCameraFoundGuideText">Sembra che il tuo dispositivo non abbia una fotocamera. In tal caso, prova a riavviare il dispositivo. Altrimenti, utilizza il pulsante Altre opzioni di seguito per aggiungere un codice a barre in un altro modo.</string>
 </resources>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="wrongValueForBarcodeType">選択したバーコード形式ではこの番号は使用できません</string>
     <string name="unsupportedBarcodeType">このバーコード形式は表示できません。将来のアップデートにより対応するかもしれません。</string>
     <string name="setBarcodeId">バーコード番号を設定</string>
@@ -52,8 +52,8 @@
     <string name="exportSuccessful">データがエクスポートされました</string>
     <string name="importSuccessful">データがインポートされました</string>
     <string name="intent_import_card_from_url_share_text">カード共有をしましょう</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">バーコード表示中は画面をロックしない</string>
-    <string name="settings_keep_screen_on">バーコード表示中は画面を消灯しない</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">バーコード表示中に画面をロックしない</string>
+    <string name="settings_keep_screen_on">バーコード表示中に画面を点けたままにする</string>
     <string name="settings_display_barcode_max_brightness">バーコード表示画面を明るくする</string>
     <string name="settings_dark_theme">ダーク</string>
     <string name="settings_light_theme">ライト</string>
@@ -64,13 +64,11 @@
     <string name="thumbnailDescription">サムネイル</string>
     <string name="selectBarcodeTitle">バーコード選択</string>
     <string name="app_libraries">Libre third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
-    <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">バージョン: <xliff:g id="version">%s</xliff:g></string>
+    <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g> について</string>
     <string name="app_license">Copylefted libre software, licensed GPLv3+</string>
-    <string name="app_copyright_old">Based on Loyalty Card Keychain
-\ncopyright © 2016–2020 Branden Archer.</string>
     <string name="app_resources">Libre third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="about">Catimaについて</string>
+    <string name="about">このアプリについて</string>
     <string name="importOptionApplicationButton">外部のアプリを使う</string>
     <string name="importOptionApplicationExplanation">任意のアプリやお気に入りのファイルマネージャーからファイルを開く。</string>
     <string name="importOptionApplicationTitle">外部アプリを使う</string>
@@ -132,8 +130,8 @@
     <string name="takePhoto">写真を撮影する</string>
     <string name="removeImage">画像を削除</string>
     <string name="setBackImage">裏面の画像を設定</string>
-    <string name="setFrontImage">オモテ面の画像を設定</string>
-    <string name="photos">フォト</string>
+    <string name="setFrontImage">表面の画像を設定</string>
+    <string name="photos">画像</string>
     <string name="backImageDescription">裏</string>
     <string name="frontImageDescription">表</string>
     <string name="importStocardMessage">Stocardでエクスポートした<i>***.zip</i>ファイルを選択してください。
@@ -152,15 +150,15 @@
     </plurals>
     <string name="barcodeImageDescriptionWithType">バーコード形式の画像 <xliff:g>%s</xliff:g></string>
     <string name="app_contributors">Made possible by: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="settings_brown_theme">Brown</string>
-    <string name="settings_grey_theme">Gray</string>
-    <string name="settings_green_theme">Green</string>
-    <string name="settings_sky_blue_theme">Sky Blue</string>
-    <string name="settings_blue_theme">Blue</string>
-    <string name="settings_violet_theme">Violet</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_pink_theme">Pink</string>
-    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_brown_theme">ブラウン/茶色</string>
+    <string name="settings_grey_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>
@@ -177,32 +175,63 @@
     <string name="exportPasswordHint">パスワードを入力してください</string>
     <string name="version_history">更新履歴</string>
     <string name="credits">貢献者</string>
-    <string name="help_translate_this_app">このアプリの翻訳を手伝う</string>
+    <string name="help_translate_this_app">翻訳を手伝う</string>
     <string name="license">ライセンス</string>
     <string name="on_google_play">Google Play</string>
-    <string name="report_error">エラーを報告する</string>
+    <string name="report_error">問題を報告する</string>
     <string name="reverse">逆順</string>
-    <string name="and_data_usage">and data usage</string>
+    <string name="and_data_usage">データの扱いなど</string>
     <string name="group_updated">グループを更新しました</string>
     <string name="editGroup">グループ編集: <xliff:g>%s</xliff:g></string>
     <string name="selectColor">色を選択</string>
-    <string name="setIcon">アイコン設定</string>
+    <string name="setIcon">サムネイルを設定</string>
     <string name="group_edit">グループ編集</string>
     <string name="group_name_already_in_use">このグループ名は既に使用されています</string>
     <string name="group_name_is_empty">空欄にすることはできません</string>
     <string name="shortcutSelectCard">カードを選択してください</string>
-    <string name="translate_platform">on Weblate</string>
+    <string name="translate_platform">Weblate</string>
     <string name="options">オプション</string>
     <string name="show_note">メモを表示</string>
     <string name="validFromDate">有効期限</string>
     <string name="chooseValidFromDate">有効期限を選択</string>
     <string name="anyDate">無期限</string>
     <string name="app_name">Catima</string>
-    <string name="settings_card_orientation">バーコードの方向</string>
+    <string name="settings_card_orientation">バーコードの向き</string>
     <string name="settings_display_barcode_max_brightness_summary">仕事をするためにいくつかのスキャナーが必要</string>
-    <string name="settings_follow_system_orientation">フォローシステム</string>
+    <string name="settings_follow_system_orientation">システムに従う</string>
     <string name="storageReadPermissionRequired">このアクションのためにストレージの読み取り権限を許可…</string>
     <string name="cameraPermissionDeniedTitle">カメラへアクセスできません</string>
-    <string name="settings_follow_sensor_orientation">いつでも回転(システム設定を無視)</string>
+    <string name="settings_follow_sensor_orientation">自動回転 (システムを無視)</string>
     <string name="cameraPermissionRequired">このアクションのためにカメラへのアクセス権限の許可…</string>
+    <string name="settings_landscape_orientation">横</string>
+    <string name="settings_portrait_orientation">縦</string>
+    <string name="noGiftCardsGroup">いくつかのカードを作って、それらをこのグループにアサインします。</string>
+    <string name="noCameraPermissionDirectToSystemSetting">バーコードをスキャンするためには、Catimaはカメラへのアクセスを必要とします。ここをタップして権限設定の変更をお願いします。</string>
+    <string name="importCards">カードをインポート</string>
+    <string name="show_balance">残高を表示</string>
+    <string name="show_validity">有効期限を表示</string>
+    <string name="donate">寄付する</string>
+    <string name="duplicateCard">複製</string>
+    <string name="unarchived">アーカイブを解除しました</string>
+    <string name="welcome">Catimaへようこそ</string>
+    <string name="show_name_below_image_thumbnail">画像サムネイルの下に名前を表示</string>
+    <string name="settings_keep_screen_on_summary">画面の自動消灯を無効化します</string>
+    <string name="settings_category_title_cards">カード</string>
+    <string name="settings_category_title_general">一般</string>
+    <string name="settings_disable_lockscreen_while_viewing_card_summary">画面のロックを無効化します</string>
+    <string name="action_display_options">表示の設定</string>
+    <string name="unarchive">アーカイブ解除</string>
+    <string name="archive">アーカイブ</string>
+    <string name="archived">アーカイブしました</string>
+    <string name="show_archived_cards">アーカイブしたカードを表示</string>
+    <string name="addFromPdfFile">PDFファイルを選択</string>
+    <string name="addWithoutBarcode">バーコードを登録せずにカードを追加</string>
+    <string name="failedToOpenUrl">ブラウザーをインストールしてください</string>
+    <string name="previousCard">前へ</string>
+    <string name="nextCard">次へ</string>
+    <string name="settings_lock_on_opening_orientation">カードを開いた時の向きに固定</string>
+    <string name="settings_oled_dark">ダークテーマで黒い背景を使用する</string>
+    <string name="settings_oled_dark_summary">有機ELディスプレイでの電池の使用量を削減します</string>
+    <string name="action_more_options">オプション</string>
+    <string name="add_a_card_in_a_different_way">別の方法でカードを追加</string>
 </resources>

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

@@ -214,7 +214,7 @@
     <string name="backImageDescription">후면 사진</string>
     <string name="currentBalanceSentence">현재 잔액: <xliff:g>%s</xliff:g></string>
     <string name="importCards">카드 가져오기</string>
-    <string name="updateBalanceTitle">얼마를 썼습니까\?</string>
+    <string name="updateBalanceTitle">지출하거나 수령한 금액은 얼마입니까?</string>
     <string name="newBalanceSentence">새 잔액: <xliff:g>%s</xliff:g></string>
     <string name="settings_card_orientation">바코드 방향</string>
     <string name="settings_follow_system_orientation">기기 설정 따르기</string>
@@ -276,4 +276,16 @@
     <string name="enter_card_id">카드에 있는 ID 숫자 또는 텍스트 입력</string>
     <string name="addWithoutBarcode">바코드가 없는 카드 추가</string>
     <string name="app_name">Catima</string>
+    <string name="add_manually_warning_title">스캔을 권장합니다</string>
+    <string name="settings_follow_sensor_orientation">항상 회전 (시스템 설정 무시)</string>
+    <string name="continue_">계속</string>
+    <string name="addFromPdfFile">PDF 파일 선택</string>
+    <string name="errorReadingFile">파일을 읽을 수 없습니다</string>
+    <string name="failedLaunchingFileManager">지원되는 파일 관리자를 찾을 수 없습니다</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">검색된 바코드 중 어떤 바코드를 사용하시겠습니까?</string>
+    <string name="pageWithNumber">페이지 <xliff:g>%d</xliff:g></string>
+    <string name="spend">보내기</string>
+    <string name="receive">받기</string>
+    <string name="amountParsingFailed">잘못된 금액</string>
+    <string name="add_manually_warning_message">일부 매장의 경우 바코드 값이 카드에 적힌 숫자와 다릅니다. 이 때문에 수동으로 바코드를 입력하는 것이 항상 작동하지 않을 수 있습니다. 대신 카메라로 바코드를 스캔하는 것이 좋습니다. 계속하시겠습니까?</string>
 </resources>

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

@@ -227,7 +227,7 @@
     <string name="unarchive">Išarchyvuoti</string>
     <string name="archived">Kortelė archyvuota</string>
     <string name="unarchived">Kortelė išarchyvuota</string>
-    <string name="updateBalanceTitle">Kiek išleidote\?</string>
+    <string name="updateBalanceTitle">Kiek išleidote?</string>
     <string name="updateBalanceHint">Įveskite sumą</string>
     <string name="currentBalanceSentence">Dabartinis likutis: <xliff:g>%s</xliff:g></string>
     <string name="newBalanceSentence">Naujas balansas: <xliff:g>%s</xliff:g></string>
@@ -261,4 +261,4 @@
     <string name="switchToFrontImage">Perjungti į priekinį vaizdą</string>
     <string name="openFrontImageInGalleryApp">Atidarykite priekinį vaizdą galerijos programėlėje</string>
     <string name="donate">Aukoti</string>
-</resources>
+</resources>

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

@@ -238,10 +238,10 @@
     <string name="noCameraPermissionDirectToSystemSetting">Lai skanētu svītrkods, Catima ir nepieciešama pieeja jūsu kamerai. Nospied šeit lai nomainītu atļaujas iestatījumus.</string>
     <string name="cameraPermissionDeniedTitle">Nevar pievienieties kamerai</string>
     <string name="updateBalance">Atjaunināta bilance</string>
-    <string name="updateBalanceTitle">Cik daudz Tu iztērēji\?</string>
+    <string name="updateBalanceTitle">Cik daudz Tu iztērēji?</string>
     <string name="updateBalanceHint">Ievadi summu</string>
     <string name="currentBalanceSentence">Šābrīža bilance: <xliff:g>%s</xliff:g></string>
     <string name="newBalanceSentence">Jauna bilance: <xliff:g>%s</xliff:g></string>
     <string name="storageReadPermissionRequired">Atļauja lasīt noliktavu ir nepieciešama šai darbībai…</string>
     <string name="importCards">Importēt kartes</string>
-</resources>
+</resources>

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

@@ -236,7 +236,7 @@
     <string name="noCameraPermissionDirectToSystemSetting">Catima trenger kameratilgang for å skanne strekkoder. Trykk her for å endre tilgangsinnstillingene.</string>
     <string name="importCards">Importer kort</string>
     <string name="currentBalanceSentence">Nåværende saldo: <xliff:g>%s</xliff:g></string>
-    <string name="updateBalanceTitle">Hvor mye brukte du\?</string>
+    <string name="updateBalanceTitle">Hvor mye brukte du?</string>
     <string name="updateBalanceHint">Skriv inn beløp</string>
     <string name="newBalanceSentence">Ny saldo: <xliff:g>%s</xliff:g></string>
     <string name="updateBalance">Oppdater saldo</string>
@@ -260,7 +260,7 @@
     <string name="setBarcodeHeight">Sett strekkodehøyde</string>
     <string name="donate">Doner</string>
     <string name="permissionReadCardsLabel">Les Catima-kort</string>
-    <string name="permissionReadCardsDescription">Les kortene dine og detaljene om dem, inkludert notater og bilder</string>
+    <string name="permissionReadCardsDescription">Les Catima-kortene dine og detaljene om dem, inkludert notater og bilder</string>
     <string name="settings_allow_content_provider_read_summary">Programmer vil fremdeles måtte forespørre tilgang for å få det innvilget</string>
     <string name="settings_display_barcode_max_brightness_summary">Nødvendig for noen skannere</string>
     <string name="settings_keep_screen_on_summary">Skrur av skjermtidsavbrudd under visning av et kort</string>
@@ -283,4 +283,17 @@
     <string name="manually_enter_barcode_instructions">Skriv inn ID-nummer eller tekst fra kortet og trykk på strekkoden som ser ut til å ligne.</string>
     <string name="enter_card_id">Skriv inn ID-nummeret eller teksten på kortet</string>
     <string name="field_must_not_be_empty">Feltet må fylles ut</string>
+    <string name="add_manually_warning_title">Skanning anbefales</string>
+    <string name="continue_">Fortsett</string>
+    <string name="amountParsingFailed">Ugyldig beløp</string>
+    <string name="spend">Utgifter</string>
+    <string name="receive">Inntekt</string>
+    <string name="settings_follow_sensor_orientation">Alltid roter (ignorerer systeminnstilling)</string>
+    <string name="add_manually_warning_message">I noen butikker er strekkoden forskjellig fra nummeret på kortet. Som følge av dette kan det hende at å skrive inn strekkoden ikke virker. Det anbefales å skanne strekkoden med kameraet istedenfor. Fortsett?</string>
+    <string name="pageWithNumber">Side <xliff:g>%d</xliff:g></string>
+    <string name="addFromPdfFile">Velg en PDF-fil</string>
+    <string name="errorReadingFile">Kunne ikke lese filen</string>
+    <string name="failedLaunchingFileManager">Fant ikke støttet filbehandler</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Hvilken av de oppdagede strekkodene vil du bruke?</string>
+    <string name="noCameraFoundGuideText">Finner ikke kamera på enheten din. Hvis dette ikke stemmer kan du prøve en omstart av den. Ellers kan du legge til strekkoder med «Mer»-knappen nedenfor.</string>
 </resources>

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

@@ -233,7 +233,7 @@
     <string name="failedToRetrieveImageFile">De afbeelding kan niet worden opgehaald</string>
     <string name="barcodeLongPressMessage">Alleen afbeeldingen kunnen worden geopend in de galerij-app</string>
     <string name="cameraPermissionDeniedTitle">Geen cameratoegang</string>
-    <string name="updateBalanceTitle">Hoeveel heb je uitgegeven\?</string>
+    <string name="updateBalanceTitle">Hoeveel heb je uitgegeven of ontvangen?</string>
     <string name="noCameraPermissionDirectToSystemSetting">Catima heeft toegang tot je camera nodig om barcodes te kunnen scannen. Druk hier om toegang te verlenen.</string>
     <string name="currentBalanceSentence">Huidig saldo: <xliff:g>%s</xliff:g></string>
     <string name="updateBalance">Saldo bijwerken</string>
@@ -284,4 +284,16 @@
     <string name="field_must_not_be_empty">Dit veld is vereist</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Altijd draaien (negeert systeeminstellingen)</string>
+    <string name="add_manually_warning_title">Scannen wordt aangeraden</string>
+    <string name="add_manually_warning_message">Bij sommige winkels wijkt de barcodewaarde af van het nummer op de kaart. Hierdoor werkt het handmatig invoeren van een barcode niet altijd. Het wordt sterk aangeraden om in plaats daarvan de barcode met je camera te scannen. Wilt u nog steeds doorgaan?</string>
+    <string name="continue_">Ga door</string>
+    <string name="spend">Geef uit</string>
+    <string name="receive">Ontvang</string>
+    <string name="amountParsingFailed">Ongeldig bedrag</string>
+    <string name="addFromPdfFile">Kies een pdf-bestand</string>
+    <string name="errorReadingFile">Lezen bestand mislukt</string>
+    <string name="failedLaunchingFileManager">Geen ondersteunde bestandsbeheerder aangetroffen</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Welke van de gevonden barcodes wil je gebruiken?</string>
+    <string name="pageWithNumber">Pagina <xliff:g>%d</xliff:g></string>
+    <string name="noCameraFoundGuideText">Uw apparaat lijkt niet over een camera te beschikken. Als het dat wel doet, probeer uw apparaat dan opnieuw op te starten. Anders gebruikt u de knop \"Meer opties\" beneden om handmatig een streepjescode in te voeren.</string>
 </resources>

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

@@ -248,7 +248,7 @@
     </plurals>
     <string name="currentBalanceSentence">Bieżące saldo: <xliff:g>%s</xliff:g></string>
     <string name="noCameraPermissionDirectToSystemSetting">By zeskanować kody kreskowe, Catima musi mieć dostęp do twojej kamery. Dotknij tutaj by zmienić swoje ustawienia dostępu.</string>
-    <string name="updateBalanceTitle">Ile wydałeś\?</string>
+    <string name="updateBalanceTitle">Ile wydałeś lub otrzymałeś?</string>
     <string name="updateBalanceHint">Wpisz sumę</string>
     <string name="updateBalance">Zaktualizuj balans</string>
     <string name="cameraPermissionDeniedTitle">Odmówiono dostępu do kamery</string>
@@ -298,4 +298,16 @@
     <string name="field_must_not_be_empty">Pole nie może być puste</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Zawsze obracaj (ignoruje ustawienia systemowe)</string>
+    <string name="continue_">Kontynuuj</string>
+    <string name="addFromPdfFile">Wybierz plik PDF</string>
+    <string name="errorReadingFile">Nie można odczytać pliku</string>
+    <string name="pageWithNumber">Strona <xliff:g>%d</xliff:g></string>
+    <string name="spend">Wydaj</string>
+    <string name="receive">Otrzymaj</string>
+    <string name="amountParsingFailed">Nieprawidłowa ilość</string>
+    <string name="add_manually_warning_title">Skanowanie jest zalecane</string>
+    <string name="failedLaunchingFileManager">Nie można znaleźć obsługiwanego menedżera plików</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Którego ze znalezionych kodów kreskowych chciałbyś użyć?</string>
+    <string name="add_manually_warning_message">W przypadku niektórych sklepów wartość kodu kreskowego różni się od liczby zapisanej na karcie. Z tego powodu ręczne wprowadzanie kodu kreskowego może nie zawsze działać. Zdecydowanie zaleca się zeskanowanie kodu kreskowego za pomocą aparatu. Czy nadal chcesz kontynuować?</string>
+    <string name="noCameraFoundGuideText">Nie wykryto kamery. Jeśli twoje urządzenie posiada kamerę, spróbuj uruchomić je ponownie. W innym wypadku wybierz Więcej opcji i dodaj kartę w inny sposób.</string>
 </resources>

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

@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">Catima</string>
+    <string name="action_search">Pesquisar</string>
+    <string name="action_add">Adicionar</string>
+    <string name="noGiftCards">Clique no botão \"+\" para adicionar um cartão ou importar a partir do menu \"⋮\".</string>
+    <string name="noGiftCardsGroup">Crie alguns cartões e, em seguida, atribua-os ao grupo aqui.</string>
+    <string name="noMatchingGiftCards">Nenhum resultado. Tente alterar sua pesquisa.</string>
+    <string name="storeName">Nome</string>
+    <string name="note">Nota</string>
+    <string name="cardId">ID do cartão</string>
+    <string name="barcodeType">Tipo de código de barras</string>
+    <string name="noBarcode">Nenhum código de barras</string>
+    <string name="star">Adicionar aos favoritos</string>
+    <string name="unstar">Remover dos favoritos</string>
+    <string name="cancel">Cancelar</string>
+    <string name="save">Salvar</string>
+    <string name="edit">Editar</string>
+    <string name="delete">Excluir</string>
+    <string name="confirm">Confirmar</string>
+    <string name="deleteTitle">Excluir cartão</string>
+    <string name="share">Compartilhar</string>
+    <string name="importExport">Importar/Exportar</string>
+    <string name="exportSuccessfulTitle">Exportado</string>
+    <string name="importing">Importando…</string>
+    <string name="exporting">Exportando…</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Para ler códigos de barras, Catima precisará de acesso à sua câmera. Toque aqui para alterar suas configurações de permissão.</string>
+    <string name="importOptionFilesystemTitle">Importar dos seus arquivos</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> selecionado</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> selecionados</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> selecionados</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Excluir <xliff:g>%d</xliff:g> cartão</item>
+        <item quantity="many">Excluir <xliff:g>%d</xliff:g> cartões</item>
+        <item quantity="other">Excluir <xliff:g>%d</xliff:g> cartões</item>
+    </plurals>
+    <string name="deleteConfirmation">Excluir esse cartão permanentemente?</string>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Excluir <xliff:g>%d</xliff:g> cartão permanentemente?</item>
+        <item quantity="many">Excluir <xliff:g>%d</xliff:g> cartões permanentemente?</item>
+        <item quantity="other">Excluir <xliff:g>%d</xliff:g> cartões permanentemente?</item>
+    </plurals>
+    <string name="ok">OK</string>
+    <string name="sendLabel">Enviar…</string>
+    <string name="editCardTitle">Editar cartão</string>
+    <string name="addCardTitle">Adicionar cartão</string>
+    <string name="scanCardBarcode">Ler código de barras</string>
+    <string name="cardShortcut">Atalho de cartões</string>
+    <string name="noCardsMessage">Adicione um cartão primeiro</string>
+    <string name="barcodeImageDescriptionWithType">Imagem <xliff:g>%s</xliff:g> do código de barras</string>
+    <string name="noCardExistsError">Não foi possível encontrar esse cartão</string>
+    <string name="failedParsingImportUriError">Não foi possível analisar o URI de importação</string>
+    <string name="exportName">Exportar</string>
+    <string name="importExportHelp">Fazer backup de seus dados permite movê-los para outro dispositivo.</string>
+    <string name="importSuccessfulTitle">Importado</string>
+    <string name="importFailedTitle">Falha na importação</string>
+    <string name="importFailed">Não foi possível importar</string>
+    <string name="exportFailedTitle">Falha na exportação</string>
+    <string name="exportFailed">Não foi possível exportar</string>
+    <string name="storageReadPermissionRequired">Permissão para ler o armazenamento é necessário para esta ação…</string>
+    <string name="cameraPermissionRequired">Permissão para acessar a câmera é necessária para esta ação…</string>
+    <string name="permissionReadCardsLabel">Ler cartões Catima</string>
+    <string name="permissionReadCardsDescription">ler seus cartões Catima e todos os seus detalhes, incluindo notas e imagens</string>
+    <string name="cameraPermissionDeniedTitle">Não foi possível acessar a câmera</string>
+    <string name="exportOptionExplanation">Os dados serão gravados em um local de sua escolha.</string>
+    <string name="importOptionFilesystemExplanation">Escolha um arquivo específico nos seus arquivos.</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> ponto</item>
+        <item quantity="many"><xliff:g>%s</xliff:g> pontos</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> pontos</item>
+    </plurals>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> cartão</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> cartões</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> cartões</item>
+    </plurals>
+    <string name="noCameraFoundGuideText">Seu dispositivo parece não ter uma câmera. Se tiver, tente reiniciar o dispositivo. Caso contrário, tente usar o botão \"Mais opções\" abaixo para adicionar um código de barras manualmente.</string>
+    <string name="settings_follow_system_orientation">Padrão do sistema</string>
+    <string name="settings_lock_on_opening_orientation">Bloquear para orientação usada ao abrir o cartão</string>
+    <string name="importCatimaMessage">Selecionar arquivo <i>catima.zip</i>, exportado do Catima, para importação.
+\nPrimeiro, crie-o pelo menu Importar/Exportar em outro aplicativo Catima clicando em Exportar.</string>
+    <string name="importLoyaltyCardKeychain">Importar do Loyalty Card Keychain</string>
+    <string name="importLoyaltyCardKeychainMessage">Selecionar arquivo <i>LoyaltyCardKeychain.csv</i>, exportado do Loyalty Card Keychain, para importação.
+\nPrimeiro, crie-o pelo menu Importar/Exportar no Loyalty Card Keychain clicando em Exportar.</string>
+    <string name="setBarcodeId">Definir valor do código de barras</string>
+    <string name="importStocard">Importar de Stocard</string>
+    <string name="importVoucherVault">Importar de Cofre de Vouchers</string>
+    <string name="barcodeId">Valor no código de barras</string>
+    <string name="sameAsCardId">Igual ao ID</string>
+    <string name="photos">Fotos</string>
+    <string name="unsupportedBarcodeType">Este tipo de código de barras não pode ser exibido. É possível que seja trazido em uma versão futura do aplicativo.</string>
+    <string name="wrongValueForBarcodeType">O valor não é válido para o tipo de código de barras selecionado</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Quero compartilhar alguns cartões com você</string>
+    <string name="backImageDescription">Imagem traseira</string>
+    <string name="frontImageDescription">Imagem frontal</string>
+    <string name="setFrontImage">Definir imagem frontal</string>
+    <string name="setBackImage">Definir imagem traseira</string>
+    <string name="removeImage">Remover imagem</string>
+    <string name="takePhoto">Tirar uma foto</string>
+    <string name="updateBarcodeQuestionTitle">Atualizar valor do código de barras?</string>
+    <string name="exportPasswordHint">Insira sua senha</string>
+    <string name="passwordRequired">Por favor, insira a senha</string>
+    <string name="exportPassword">Defina uma senha para proteger o arquivo exportado (opcional)</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="add_manually_warning_message">Em algumas lojas, o valor do código de barras é diferente do número escrito no cartão. Por esse motivo, inserir um código de barras manualmente pode nem sempre funcionar. É altamente recomendável digitalizar o código de barras com a câmera. Você ainda deseja continuar?</string>
+    <string name="importOptionApplicationTitle">Usar outro aplicativo</string>
+    <string name="importOptionApplicationExplanation">Use qualquer aplicativo ou o seu gerenciador de arquivos favorito para abrir um arquivo.</string>
+    <string name="importOptionApplicationButton">Usar outro aplicativo</string>
+    <string name="about">Sobre</string>
+    <string name="about_title_fmt">Sobre <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Versão: <xliff:g id="version">%s</xliff:g></string>
+    <string name="selectBarcodeTitle">Selecionar código de barras</string>
+    <string name="settings">Configurações</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os e contribuidores</string>
+    <string name="app_copyright_short">Copyright © Sylvia van Os e contribuidores</string>
+    <string name="app_copyright_old">Baseado no Loyalty Card Keychain
+\ncopyright © 2016–2020 Branden Archert</string>
+    <string name="importOptionFilesystemButton">A partir do Sistema de Arquivos</string>
+    <string name="thumbnailDescription">Miniatura</string>
+    <string name="starImage">Item favorito</string>
+    <string name="app_libraries">Bibliotecas open source de terceiros : <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Recursos open source de terceiros: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="updateBarcodeQuestionText">Você mudou o ID. Também quer atualizar o código de barras para usar o mesmo valor?</string>
+    <string name="yes">Sim</string>
+    <string name="no">Não</string>
+    <string name="failedGeneratingShareURL">Não foi possível gerar uma URL compartilhável. Por favor, reporte isto.</string>
+    <string name="turn_flashlight_on">Ligar lanterna</string>
+    <string name="turn_flashlight_off">Desligar lanterna</string>
+    <string name="settings_locale">Idioma</string>
+    <string name="settings_oled_dark_summary">Reduz o uso da bateria em telas OLED</string>
+    <string name="settings_system_locale">Sistema</string>
+    <string name="settings_oled_dark">Preto puro como cor de fundo para o tema escuro</string>
+    <string name="settings_pink_theme">Rosa</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_blue_theme">Azul</string>
+    <string name="settings_sky_blue_theme">Azul celeste</string>
+    <string name="settings_green_theme">Verde</string>
+    <string name="settings_grey_theme">Cinza</string>
+    <string name="settings_brown_theme">Marrom</string>
+    <string name="app_contributors">Só foi possível graças a: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="sort">Ordenar</string>
+    <string name="showMoreInfo">Mostrar informações</string>
+    <string name="updateBalance">Atualizar saldo</string>
+    <string name="failedToRetrieveImageFile">Falha ao recuperar o arquivo de imagem</string>
+    <string name="barcodeLongPressMessage">Apenas imagens podem ser abertas na galeria</string>
+    <string name="sort_by_most_recently_used">Usado mais recentemente</string>
+    <string name="reverse">...em ordem inversa</string>
+    <string name="sort_by">Ordenar por</string>
+    <string name="version_history">Histórico de Atualização</string>
+    <string name="and_data_usage">e uso de dados</string>
+    <string name="rate_this_app">Avalie este aplicativo</string>
+    <string name="on_google_play">na Google Play</string>
+    <string name="report_error">Informar erro</string>
+    <string name="setIcon">Definir miniatura</string>
+    <string name="options">Opções</string>
+    <string name="starred">Favoritos</string>
+    <string name="duplicateCard">Duplicar</string>
+    <string name="archived">Cartão arquivado</string>
+    <string name="unarchived">Cartão desarquivado</string>
+    <string name="failedLaunchingPhotoPicker">Não foi possível encontrar um aplicativo de galeria compatível</string>
+    <string name="failedToOpenUrl">Instale um navegador primeiro</string>
+    <string name="welcome">Bem-vindo(a) ao Catima</string>
+    <string name="importCards">Importar cartões</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Ver arquivamento (<xliff:g>%1$d</xliff:g> cartão)</item>
+        <item quantity="many">Ver arquivamento (<xliff:g>%1$d</xliff:g> cartões)</item>
+        <item quantity="other">Ver arquivamento (<xliff:g>%1$d</xliff:g> cartões)</item>
+    </plurals>
+    <string name="height">Altura:</string>
+    <string name="switchToBarcode">Mudar para código de barras</string>
+    <string name="switchToFrontImage">Mudar para imagem frontal</string>
+    <string name="switchToBackImage">Mudar para imagem traseira</string>
+    <string name="openFrontImageInGalleryApp">Abrir imagem frontal no aplicativo da galeria</string>
+    <string name="openBackImageInGalleryApp">Abrir imagem traseira no aplicativo da galeria</string>
+    <string name="setBarcodeHeight">Definir altura do código de barras</string>
+    <string name="donate">Doar</string>
+    <string name="icon_header_click_text">Pressione e segure para editar a miniatura</string>
+    <string name="show_name_below_image_thumbnail">Mostrar nome abaixo da miniatura</string>
+    <string name="show_note">Mostrar nota</string>
+    <string name="show_balance">Mostrar saldo</string>
+    <string name="show_validity">Mostrar validade</string>
+    <string name="action_more_options">Mais opções</string>
+    <string name="addWithoutBarcode">Adicionar cartão sem código de barras</string>
+    <string name="card_id_must_not_be_empty">O ID do cartão não pode estar vazio</string>
+    <string name="add_a_card_in_a_different_way">Adicionar cartão de outra forma</string>
+    <string name="field_must_not_be_empty">O campo não pode estar vazio</string>
+    <string name="spend">Gastar</string>
+    <string name="receive">Receber</string>
+    <string name="amountParsingFailed">Quantidade inválida</string>
+    <string name="addFromPdfFile">Selecionar arquivo PDF</string>
+    <string name="settings_theme_color">Cor do tema</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="selectColor">Selecionar cor</string>
+    <string name="settings_violet_theme">Violeta</string>
+    <string name="sort_by_name">Nome</string>
+    <string name="sort_by_expiry">Expiração</string>
+    <string name="credits">Créditos</string>
+    <string name="license">Licença</string>
+    <string name="source_repository">Repositório de Origem</string>
+    <string name="on_github">no GitHub</string>
+    <string name="translate_platform">no Weblate</string>
+    <string name="help_translate_this_app">Ajude a traduzir este aplicativo</string>
+    <string name="shortcutSelectCard">Selecione um cartão</string>
+    <string name="include_if_asking_support">Se você gostaria de solicitar suporte, inclua as seguintes informações:</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> cartão (<xliff:g id="archivedCount">%2$d</xliff:g> arquivado)</item>
+        <item quantity="many"><xliff:g>%1$d</xliff:g> cartões (<xliff:g id="archivedCount">%2$d</xliff:g> arquivados)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> cartões (<xliff:g id="archivedCount">%2$d</xliff:g> arquivados)</item>
+    </plurals>
+    <string name="archive">Arquivar</string>
+    <string name="unarchive">Desarquivar</string>
+    <string name="previousCard">Anterior</string>
+    <string name="nextCard">Próximo</string>
+    <string name="updateBalanceTitle">Quanto você gastou ou recebeu?</string>
+    <string name="currentBalanceSentence">Saldo atual: <xliff:g>%s</xliff:g></string>
+    <string name="newBalanceSentence">Novo saldo: <xliff:g>%s</xliff:g></string>
+    <string name="settings_category_title_cards">Cartões</string>
+    <string name="updateBalanceHint">Inserir quantidade</string>
+    <string name="anyDate">Qualquer data</string>
+    <string name="settings_category_title_general">Geral</string>
+    <string name="settings_category_title_privacy">Privacidade</string>
+    <string name="action_display_options">Configurações de exibição</string>
+    <string name="show_archived_cards">Mostrar cartões arquivados</string>
+    <string name="add_manually_warning_title">A digitalização é recomendada</string>
+    <string name="continue_">Continuar</string>
+    <string name="errorReadingFile">Não foi possível fazer a leitura do arquivo</string>
+    <string name="failedLaunchingFileManager">Não foi possível encontrar um gerenciador de arquivos compatível</string>
+    <string name="pageWithNumber">Página <xliff:g>%d</xliff:g></string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Qual dos códigos de barras encontrados você quer usar?</string>
+    <string name="settings_display_barcode_max_brightness">Clarear visão do código de barras</string>
+    <string name="settings_display_barcode_max_brightness_summary">Necessário para alguns scanners funcionarem</string>
+    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
+    <string name="balance">Saldo</string>
+    <string name="settings_follow_sensor_orientation">Sempre girar (ignora as configurações do sistema)</string>
+    <string name="settings_theme">Tema</string>
+    <string name="settings_light_theme">Claro</string>
+    <string name="settings_system_theme">Sistema</string>
+    <string name="settings_dark_theme">Escuro</string>
+    <string name="moveBarcodeToTopOfScreen">Mover o código de barras para o topo da tela</string>
+    <string name="settings_card_orientation">Orientação do código de barras</string>
+    <string name="settings_portrait_orientation">Retrato</string>
+    <string name="settings_landscape_orientation">Paisagem</string>
+    <string name="settings_keep_screen_on_summary">Desativa o tempo limite de tela enquanto estiver vendo um cartão</string>
+    <string name="importSuccessful">Dados importados</string>
+    <string name="settings_disable_lockscreen_while_viewing_card_summary">Desativa bloqueio de tela enquanto estiver vendo um cartão</string>
+    <string name="intent_import_card_from_url_share_text">Eu quero compartilhar um cartão com você</string>
+    <string name="settings_keep_screen_on">Manter tela ligada</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Previnir bloqueio de tela</string>
+    <string name="settings_allow_content_provider_read_title">Permitir que outros aplicativos acessem meus dados</string>
+    <string name="settings_allow_content_provider_read_summary">Aplicativos ainda precisarão pedir permissão para ter acesso concedido</string>
+    <string name="group_edit">Editar grupo</string>
+    <string name="exportSuccessful">Dados exportados</string>
+    <string name="noGroups">Clique no botão \"+\" para adicionar grupos a serem categorizados.</string>
+    <string name="group_name_already_in_use">Nome do grupo já em uso</string>
+    <string name="deleteConfirmationGroup">Excluir grupo?</string>
+    <string name="failedOpeningFileManager">Instale um gerenciador de arquivos primeiro.</string>
+    <string name="enter_group_name">Inserir nome do grupo</string>
+    <string name="groups">Grupos</string>
+    <string name="noGroupCards">Este grupo está vazio</string>
+    <string name="group_name_is_empty">O nome do grupo não pode estar vazio</string>
+    <string name="group_updated">Grupo atualizado</string>
+    <string name="all">Todos</string>
+    <string name="addManually">Insira o código de barras manualmente</string>
+    <string name="chooseExpiryDate">Escolher data de expiração</string>
+    <string name="moveUp">Mover para cima</string>
+    <string name="never">Nunca</string>
+    <string name="moveDown">Mover para baixo</string>
+    <string name="leaveWithoutSaveTitle">Sair</string>
+    <string name="leaveWithoutSaveConfirmation">Sair sem salvar?</string>
+    <string name="groupsList">Grupos: <xliff:g>%s</xliff:g></string>
+    <string name="editGroup">Editando grupo: <xliff:g>%s</xliff:g></string>
+    <string name="editBarcode">Editar código de barras</string>
+    <string name="expiryDate">Data de expiração</string>
+    <string name="noBarcodeFound">Nenhum código de barras foi encontrado</string>
+    <string name="addFromImage">Selecionar uma imagem da galeria</string>
+    <string name="expiryStateSentence">Expira: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Expirado: <xliff:g>%s</xliff:g></string>
+    <string name="card">Cartão</string>
+    <string name="errorReadingImage">Não foi possível ler a imagem</string>
+    <string name="points">Pontos</string>
+    <string name="privacy_policy">Política de Privacidade</string>
+    <string name="currency">Moeda</string>
+    <string name="chooseImportType">Importar dados de</string>
+    <string name="privacy_policy_popup_text">Declaração de Política de Privacidade
+\n
+\nNENHUM DADO É COLETADO, o que pode ser confimado por qualquer pessoa já que o nosso aplicativo é software livre.</string>
+    <string name="importCatima">Importar do Catima</string>
+    <string name="balanceParsingFailed">Saldo inválido</string>
+    <string name="accept">Aceitar</string>
+    <string name="importFidme">Importar de FidMe</string>
+    <string name="importFidmeMessage">Selecione o arquivo <i>fidme-export-request-xxxxxx.zip</i>, exportado de FidMe, para importação e em seguida selecione o tipo de código de barras manualmente.
+\nCrie-o pelo seu perfil no FidMe escolhendo \'Proteção de Dados\' (Data Protection) e então clicando em \"Extrair meus dados\".</string>
+    <string name="importStocardMessage">Selecionar arquivo <i>***.zip</i>, exportado de Stocard, para importação.
+\nObtenha-o enviando um e-mail para support@stocardapp.com solicitando exportação dos seus dados.</string>
+    <string name="importVoucherVaultMessage">Selecionar arquivo<i>vouchervault.json</i>, exportado de Voucher Vault, para importação.
+\nPrimeiro, crie-o pressionando em Exportar no Voucher Vault.</string>
+    <string name="enter_card_id">Insira o ID ou texto escrito no seu cartão</string>
+    <string name="manually_enter_barcode_instructions">Insira o ID ou texto escrito no seu cartão e clique no código de barras que se parece com o do seu cartão.</string>
+    <string name="app_license">Software livre com copyleft, licenciado sob a licença GPLv3+</string>
+    <string name="validFromDate">Válido a partir de</string>
+    <string name="chooseValidFromDate">Escolha uma data válida a partir de</string>
+    <string name="validFromSentence">Válido a partir de: <xliff:g>%s</xliff:g></string>
+    <string name="view_online">Ver online</string>
+</resources>

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

@@ -123,7 +123,7 @@
     <string name="groupsList">Grupos: <xliff:g>%s</xliff:g></string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
     <string name="editBarcode">Editar código de barras</string>
-    <string name="expiryDate">Data de expiração</string>
+    <string name="expiryDate">Data de validade</string>
     <string name="never">Nunca</string>
     <string name="chooseExpiryDate">Escolher validade</string>
     <string name="moveBarcodeToTopOfScreen">Mover o código de barras para o topo do ecrã</string>
@@ -152,7 +152,7 @@
     <string name="unsupportedBarcodeType">Este tipo de código de barras ainda não pode ser mostrado. Pode vir a ser suportado numa versão posterior da aplicação.</string>
     <string name="setFrontImage">Definir imagem frontal</string>
     <string name="setBackImage">Definir imagem de trás</string>
-    <string name="failedGeneratingShareURL">Não foi possível gerar uma URL partilhável. Por favor reporte isto aos programadores.</string>
+    <string name="failedGeneratingShareURL">Não foi possível gerar um URL partilhável. Por favor reporte isto aos programadores.</string>
     <string name="turn_flashlight_on">Ligar lanterna</string>
     <string name="turn_flashlight_off">Desligar lanterna</string>
     <string name="settings_locale">Idioma</string>
@@ -167,7 +167,7 @@
     <string name="sort">Ordenar</string>
     <string name="sort_by_name">Nome</string>
     <string name="sort_by_most_recently_used">Mais usados recentemente</string>
-    <string name="sort_by_expiry">Expiração</string>
+    <string name="sort_by_expiry">Validade</string>
     <string name="reverse">…na ordem inversa</string>
     <string name="sort_by">Ordenar por</string>
     <string name="version_history">Histórico de versões</string>
@@ -203,7 +203,7 @@
     <string name="shortcutSelectCard">Selecione um cartão</string>
     <string name="translate_platform">no Weblate</string>
     <string name="starred">Estrela</string>
-    <string name="showMoreInfo">Mostrar info</string>
+    <string name="showMoreInfo">Mostrar informação</string>
     <string name="options">Opções</string>
     <plurals name="balancePoints">
         <item quantity="one"><xliff:g>%s</xliff:g> ponto</item>
@@ -230,7 +230,7 @@
     <string name="failedLaunchingPhotoPicker">Não foi encontrada nenhuma aplicação de galeria de imagens</string>
     <string name="nextCard">Próximo</string>
     <string name="previousCard">Anterior</string>
-    <string name="failedToOpenUrl">Instale primeiro um navegador da Internet</string>
+    <string name="failedToOpenUrl">Instale primeiro um navegador de Internet</string>
     <plurals name="viewArchivedCardsWithCount">
         <item quantity="one">Ver arquivo (<xliff:g>%1$d</xliff:g> cartão)</item>
         <item quantity="many">Ver arquivo (<xliff:g>%1$d</xliff:g> cartões)</item>
@@ -238,14 +238,14 @@
     </plurals>
     <string name="welcome">Bem-vindo ao Catima</string>
     <string name="failedToRetrieveImageFile">Falha ao recuperar o ficheiro de imagem</string>
-    <string name="barcodeLongPressMessage">Apenas imagens podem ser abertas na aplicação de galeria</string>
+    <string name="barcodeLongPressMessage">Só podem ser abertas imagens na aplicação da galeria</string>
     <string name="noCameraPermissionDirectToSystemSetting">Para digitalizar código de barras, o Catima tem de aceder à câmara. Clique aqui para mudar as configurações de permissão.</string>
     <string name="cameraPermissionDeniedTitle">Não foi possível aceder à câmara</string>
     <string name="importCards">Importar cartões</string>
     <string name="currentBalanceSentence">Saldo atual: <xliff:g>%s</xliff:g></string>
     <string name="newBalanceSentence">Novo saldo: <xliff:g>%s</xliff:g></string>
     <string name="updateBalance">Atualizar saldo</string>
-    <string name="updateBalanceTitle">Quanto gastou\?</string>
+    <string name="updateBalanceTitle">Quanto gastou ou recebeu?</string>
     <string name="updateBalanceHint">Introduza o valor</string>
     <string name="storageReadPermissionRequired">É necessária a permissão para ler o armazenamento para esta ação…</string>
     <string name="cameraPermissionRequired">É necessária a permissão para aceder à câmara para esta ação…</string>
@@ -272,22 +272,35 @@
     <string name="settings_keep_screen_on_summary">Desativa o tempo limite da tela ao visualizar um cartão</string>
     <string name="settings_allow_content_provider_read_title">Permitir que outros aplicativos acessem meus dados</string>
     <string name="settings_allow_content_provider_read_summary">Os aplicativos ainda terão que solicitar permissão para receber acesso</string>
-    <string name="settings_oled_dark_summary">Reduz o uso da bateria em telas OLED</string>
+    <string name="settings_oled_dark_summary">Reduz a utilização da bateria em ecrãs OLED</string>
     <string name="icon_header_click_text">Pressione e segure para editar o icone</string>
-    <string name="settings_category_title_cards">cartões</string>
-    <string name="settings_category_title_general">geral</string>
+    <string name="settings_category_title_cards">Cartões</string>
+    <string name="settings_category_title_general">Geral</string>
     <string name="settings_category_title_privacy">Privacidade</string>
     <string name="card_id_must_not_be_empty">O ID do cartão não pode estar vazio</string>
     <string name="balanceParsingFailed">Saldo inválido</string>
     <string name="add_a_card_in_a_different_way">Adicione um cartão de uma forma diferente</string>
-    <string name="view_online">Exibir online</string>
+    <string name="view_online">Ver online</string>
     <string name="manually_enter_barcode_instructions">Digite o número ID ou o texto em seu cartão e pressione o código de barras que se parece com o que está em seu cartão.</string>
     <string name="action_more_options">Mais opções</string>
     <string name="enter_card_id">Digite o número ID ou o texto em seu cartão</string>
-    <string name="action_display_options">Opções de exibição</string>
+    <string name="action_display_options">Opções de visualização</string>
     <string name="addWithoutBarcode">Adicione um cartão sem código de barras</string>
     <string name="app_copyright_short">Copyright © Sylvia van Os e colaboradores</string>
     <string name="field_must_not_be_empty">O campo não pode estar vazio</string>
-    <string name="show_archived_cards">Exibir cartões arquivados</string>
+    <string name="show_archived_cards">Mostrar cartões arquivados</string>
     <string name="app_name">Catima</string>
+    <string name="continue_">Continuar</string>
+    <string name="add_manually_warning_title">Recomenda-se a digitalização</string>
+    <string name="add_manually_warning_message">Em algumas lojas, o valor do código de barras é diferente do número escrito no cartão. Por este motivo, a introdução manual de um código de barras pode nem sempre funcionar. Recomenda-se vivamente que, em vez disso, digitalize o código de barras com a sua câmara. Ainda quer continuar?</string>
+    <string name="spend">Gastar</string>
+    <string name="receive">Receber</string>
+    <string name="amountParsingFailed">Montante inválido</string>
+    <string name="settings_follow_sensor_orientation">Rodar sempre (ignora as definições do sistema)</string>
+    <string name="addFromPdfFile">Selecionar um ficheiro PDF</string>
+    <string name="errorReadingFile">Não foi possível ler o ficheiro</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Qual dos códigos de barras encontrados pretende utilizar?</string>
+    <string name="pageWithNumber">Página <xliff:g>%d</xliff:g></string>
+    <string name="failedLaunchingFileManager">Não foi possível encontrar um gestor de ficheiros suportado</string>
+    <string name="noCameraFoundGuideText">O seu dispositivo não parece ter uma câmara. Se tiver, tente reiniciar o dispositivo. Caso contrário, utilize o botão \"Mais opções\" abaixo para adicionar um código de barras de outra maneira.</string>
 </resources>

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

@@ -24,10 +24,10 @@
     <string name="card">Cardul</string>
     <string name="settings_theme">Tema</string>
     <string name="all">Toate</string>
-    <string name="noCardsMessage">Adăugați mai întâi o carte</string>
+    <string name="noCardsMessage">Adăugați mai întâi un card</string>
     <string name="noCardExistsError">Acel card nu a putut fi găsit</string>
     <string name="failedParsingImportUriError">Nu s-a putut analiza URI-ul de import</string>
-    <string name="importExport">Importație/Export</string>
+    <string name="importExport">Importă/Exportă</string>
     <string name="exportName">Exportați</string>
     <string name="importSuccessfulTitle">Importat</string>
     <string name="importFailedTitle">Importul a eșuat</string>
@@ -78,7 +78,7 @@
     <string name="points">Puncte</string>
     <string name="cardShortcut">Scurtătură de card</string>
     <string name="scanCardBarcode">Scanați codul de bare</string>
-    <string name="importExportHelp">Copierea de rezervă a datelor vă permite să le mutați pe un alt dispozitiv</string>
+    <string name="importExportHelp">Copierea de rezervă a datelor vă permite să le mutați pe un alt dispozitiv.</string>
     <string name="exportSuccessfulTitle">Exportată</string>
     <string name="exportFailedTitle">Export eșuat</string>
     <string name="importOptionFilesystemExplanation">Alegeți un anumit fișier din sistemul de fișiere.</string>
@@ -257,7 +257,7 @@
     <string name="show_archived_cards">Afișați cardurile arhivate</string>
     <string name="settings_card_orientation">Orientarea codului de bare</string>
     <string name="app_libraries">Biblioteci terță deschise: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="updateBalanceTitle">Cât de mult ați folosit?</string>
+    <string name="updateBalanceTitle">Cât de mult ați cheltuit sau primit?</string>
     <string name="settings_blue_theme">Albastru</string>
     <string name="app_resources">Resurse terță deschise: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_name">Catima</string>
@@ -290,4 +290,16 @@
     <string name="settings_keep_screen_on_summary">Dezactivează temporizatorul de ecran când vizualizați un card</string>
     <string name="rate_this_app">Acordați o recenzie acestei aplicații</string>
     <string name="credits">Contribuabili</string>
+    <string name="settings_follow_sensor_orientation">Rotește întotdeauna (ignora setările de sistem)</string>
+    <string name="continue_">Continua</string>
+    <string name="add_manually_warning_title">Se recomandă scanarea</string>
+    <string name="add_manually_warning_message">Pentru unele magazine, valoarea codului de bare diferă de numărul scris pe card. Din acest motiv, este posibil ca introducerea manuală a unui cod de bare să nu funcționeze întotdeauna. În schimb, este recomandat să scanați codul de bare cu camera dvs. Mai vrei să continui?</string>
+    <string name="spend">Cheltuie</string>
+    <string name="receive">Primește</string>
+    <string name="amountParsingFailed">Sumă nevalidă</string>
+    <string name="addFromPdfFile">Selectați un fișier PDF</string>
+    <string name="errorReadingFile">Nu am putut citi fișierul</string>
+    <string name="failedLaunchingFileManager">Nu s-a găsit un manager de fișiere suportat</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Pe care dintre codurile de bare găsite dorești să-l folosești?</string>
+    <string name="pageWithNumber">Pagina <xliff:g>%d</xliff:g></string>
 </resources>

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

@@ -18,7 +18,7 @@
     <string name="sendLabel">Отправить…</string>
     <string name="editCardTitle">Изменить карту</string>
     <string name="addCardTitle">Добавить карту</string>
-    <string name="scanCardBarcode">Отсканируйте штрих-код</string>
+    <string name="scanCardBarcode">Сканировать штрих-код</string>
     <string name="cardShortcut">Ярлык карты</string>
     <string name="noCardsMessage">Сначала добавьте карту</string>
     <string name="noCardExistsError">Карта не найдена</string>
@@ -252,7 +252,7 @@
     <string name="currentBalanceSentence">Текущий баланс: <xliff:g>%s</xliff:g></string>
     <string name="cameraPermissionDeniedTitle">Камера недоступна</string>
     <string name="updateBalanceHint">Введите сумму</string>
-    <string name="updateBalanceTitle">Какое изменение\?</string>
+    <string name="updateBalanceTitle">Сколько потрачено или получено?</string>
     <string name="importCards">Импорт карт</string>
     <string name="storageReadPermissionRequired">Для этого действия необходимо разрешение на чтение хранилища…</string>
     <string name="cameraPermissionRequired">Для этого действия необходимо разрешение на доступ к камере…</string>
@@ -298,4 +298,16 @@
     <string name="field_must_not_be_empty">Поле не может быть пустым</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Всегда поворачивать (игнорировать системные настройки)</string>
+    <string name="add_manually_warning_title">Рекомендуется сканирование</string>
+    <string name="continue_">Продолжить</string>
+    <string name="add_manually_warning_message">В некоторых магазинах значение штрих-кода отличается от написанного на карте номера, из-за чего введение штрих-кода вручную не всегда работает. Вместо этого настоятельно рекомендуется отсканировать штрих-код камерой. Продолжить?</string>
+    <string name="spend">Потрачено</string>
+    <string name="receive">Получено</string>
+    <string name="amountParsingFailed">Недопустимая сумма</string>
+    <string name="addFromPdfFile">Выберите PDF-файл</string>
+    <string name="errorReadingFile">Невозможно прочитать файл</string>
+    <string name="pageWithNumber">Страница <xliff:g>%d</xliff:g></string>
+    <string name="failedLaunchingFileManager">Не найден поддерживаемый файловый менеджер</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Какой из найденных штрих-кодов вы хотите использовать?</string>
+    <string name="noCameraFoundGuideText">Похоже, ваше устройство не оснащено камерой. Если это не так, попробуйте перезагрузить устройство. В противном случае воспользуйтесь кнопкой \"Ещё\", чтобы добавить штри-хкод другим способом.</string>
 </resources>

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

@@ -204,7 +204,7 @@
     <string name="unarchived">Karta vrátená z archívu</string>
     <string name="previousCard">Predošlá</string>
     <string name="nextCard">Nasledujúca</string>
-    <string name="updateBalanceTitle">Koľko ste minuli\?</string>
+    <string name="updateBalanceTitle">Koľko ste minuli alebo prjali?</string>
     <string name="updateBalanceHint">Zadajte čiastku</string>
     <string name="failedToOpenUrl">Najprv nainštalujte webový prehliadač</string>
     <string name="welcome">Vitajte v Catima</string>
@@ -291,4 +291,15 @@
     <string name="show_archived_cards">Zobraziť archivované karty</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Vždy otáčať (ignoruje nastavenie systému)</string>
+    <string name="continue_">Pokračovať</string>
+    <string name="spend">Utratené</string>
+    <string name="receive">Prijaté</string>
+    <string name="amountParsingFailed">Neplatná hodnota</string>
+    <string name="add_manually_warning_title">Skenovanie je odporúčané</string>
+    <string name="add_manually_warning_message">V niektorých obchodoch nie je číslo na cenovke totožné s čiarovým kódom, preto je lepšie zoskenovať čiarový kód. Chcete napriek tomu pokračovať?</string>
+    <string name="addFromPdfFile">Vyberte súbor PDF</string>
+    <string name="errorReadingFile">Súbor sa nepodarilo prečítať</string>
+    <string name="failedLaunchingFileManager">Nepodarilo sa nájsť podporovaného správcu súborov</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Ktorý z nájdených čiarových kódov chcete použiť?</string>
+    <string name="pageWithNumber">Stránka <xliff:g>%d</xliff:g></string>
 </resources>

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

@@ -185,7 +185,7 @@
     <string name="failedLaunchingPhotoPicker">Ni mogoče najti podprte aplikacije za gledanje slik</string>
     <string name="previousCard">Prejšnje</string>
     <string name="nextCard">Naslednje</string>
-    <string name="updateBalanceTitle">Koliko ste porabili\?</string>
+    <string name="updateBalanceTitle">Koliko ste porabili?</string>
     <string name="updateBalanceHint">Vpišite vrednost</string>
     <string name="group_name_already_in_use">Ime skupine je že uporabljeno</string>
     <string name="group_name_is_empty">Ime skupine ne more biti prazno polje</string>

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

@@ -242,7 +242,7 @@
     <string name="updateBalance">Uppdatera balans</string>
     <string name="failedToRetrieveImageFile">Misslyckades att hämta bildfil</string>
     <string name="barcodeLongPressMessage">Endast bilder kan öppnas i galleri app</string>
-    <string name="updateBalanceTitle">Hur mycket spenderade du\?</string>
+    <string name="updateBalanceTitle">Hur mycket spenderade du?</string>
     <string name="updateBalanceHint">Ange summa</string>
     <string name="newBalanceSentence">Ny balans: <xliff:g>%s</xliff:g></string>
     <string name="openFrontImageInGalleryApp">Öppna bilden på framsidan i galleri-appen</string>

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

@@ -235,7 +235,7 @@
     <string name="noCameraPermissionDirectToSystemSetting">Barkodları taramak için Catima\'nın kameranıza erişmesi gerekecektir. İzin ayarlarınızı değiştirmek için buraya dokunun.</string>
     <string name="currentBalanceSentence">Geçerli bakiye: <xliff:g>%s</xliff:g></string>
     <string name="updateBalanceHint">Miktarı girin</string>
-    <string name="updateBalanceTitle">Ne kadar harcadınız\?</string>
+    <string name="updateBalanceTitle">Ne kadar harcadınız veya aldınız?</string>
     <string name="newBalanceSentence">Yeni bakiye: <xliff:g>%s</xliff:g></string>
     <string name="cameraPermissionDeniedTitle">Kameraya erişilemedi</string>
     <string name="updateBalance">Bakiyeyi güncelle</string>
@@ -284,4 +284,16 @@
     <string name="field_must_not_be_empty">Alan boş olamaz</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Her zaman döndür (sistem ayarlarını yok sayar)</string>
+    <string name="continue_">Devam et</string>
+    <string name="add_manually_warning_title">Tarama yapılması tavsiye edilir</string>
+    <string name="add_manually_warning_message">Bazı mağazalarda barkod değeri kartta yazan sayıdan farklıdır. Bu nedenle, bir barkodu elle girmek her zaman işe yaramayabilir. Bunun yerine barkodu kameranızla taramanız şiddetle tavsiye edilir. Yine de devam etmek istiyor musunuz?</string>
+    <string name="spend">Harca</string>
+    <string name="receive">Al</string>
+    <string name="amountParsingFailed">Geçersiz miktar</string>
+    <string name="errorReadingFile">Dosya okunamadı</string>
+    <string name="failedLaunchingFileManager">Desteklenen dosya yöneticisi bulunamadı</string>
+    <string name="addFromPdfFile">PDF dosyası seç</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Bulunan barkodlardan hangisini kullanmak istiyorsunuz?</string>
+    <string name="pageWithNumber">Sayfa <xliff:g>%d</xliff:g></string>
+    <string name="noCameraFoundGuideText">Aygıtınızda kamera yok gibi görünüyor. Eğer varsa, aygıtı yeniden başlatmayı deneyin. Aksi takdirde, barkodu başka bir şekilde eklemek için aşağıdaki daha fazla seçenek düğmesini kullanın.</string>
 </resources>

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

@@ -87,7 +87,7 @@
     <string name="app_license">Вільне копілефт програмне забезпечення, ліцензоване GPLv3+</string>
     <string name="app_copyright_old">Створено на основі Loyalty Card Keychain
 \nавторські права © 2016–2020 Branden Archer</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Авторські права © 2019–<xliff:g>%d</xliff:g> Sylvia van Os та вкладники</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Авторські права © 2019–<xliff:g>%d</xliff:g> Sylvia van Os та співавтори</string>
     <string name="about">Про застосунок</string>
     <string name="importOptionApplicationButton">Використати інший застосунок</string>
     <string name="importOptionApplicationExplanation">Використайте інший застосунок чи ваш улюблений файловий менеджер для відкриття файлу.</string>
@@ -131,7 +131,7 @@
     <string name="action_search">Пошук</string>
     <string name="turn_flashlight_off">Вимкнути спалах</string>
     <string name="turn_flashlight_on">Увімкнути спалах</string>
-    <string name="failedGeneratingShareURL">Збій створення URL обміну. Будь ласка повідомте про цю помилку.</string>
+    <string name="failedGeneratingShareURL">Збій створення URL обміну. Будь ласка повідомте про це.</string>
     <string name="passwordRequired">Будь ласка введіть пароль</string>
     <string name="takePhoto">Зробити світлину</string>
     <string name="removeImage">Видалити зображення</string>
@@ -140,9 +140,9 @@
     <string name="photos">Світлини</string>
     <string name="backImageDescription">Тильна сторона</string>
     <string name="frontImageDescription">Лицьова сторона</string>
-    <string name="importStocardMessage">Виберіть експорт <i> ***.zip </i> зі Stocard для імпорту.
+    <string name="importStocardMessage">Виберіть експорт <i> ***.zip </i> з Stocard для імпорту. 
 \nОтримайте його, надіславши електронного листа support@stocardapp.com з проханням експортувати ваші дані.</string>
-    <string name="importStocard">Імпорт із Stocard</string>
+    <string name="importStocard">Імпорт з Stocard</string>
     <plurals name="selectedCardCount">
         <item quantity="one">Обрано: <xliff:g>%d</xliff:g></item>
         <item quantity="few">Обрані: <xliff:g>%d</xliff:g></item>
@@ -247,7 +247,7 @@
     <string name="failedToRetrieveImageFile">Збій доступу до файлу зображення</string>
     <string name="barcodeLongPressMessage">Галерея може відкривати лише зображення</string>
     <string name="importCards">Імпорт карток</string>
-    <string name="updateBalanceTitle">Скільки витратили\?</string>
+    <string name="updateBalanceTitle">Скільки ви витратили або отримали?</string>
     <string name="updateBalanceHint">Введіть суму</string>
     <string name="currentBalanceSentence">Поточний баланс: <xliff:g>%s</xliff:g></string>
     <string name="newBalanceSentence">Новий баланс: <xliff:g>%s</xliff:g></string>
@@ -280,13 +280,13 @@
     <string name="settings_keep_screen_on_summary">Вимикає тайм-аут екрана під час перегляду картки</string>
     <string name="settings_disable_lockscreen_while_viewing_card_summary">Вимикає блокування екрана під час перегляду картки</string>
     <string name="settings_allow_content_provider_read_title">Дозволити іншим застосункам доступ до моїх даних</string>
-    <string name="settings_oled_dark_summary">Зменшує використання батареї на екранах з OLED</string>
+    <string name="settings_oled_dark_summary">Зменшує використання батареї на OLED екранах</string>
     <string name="settings_category_title_cards">Картки</string>
     <string name="settings_category_title_general">Загальні</string>
     <string name="settings_category_title_privacy">Конфіденційність</string>
     <string name="view_online">Переглянути онлайн</string>
-    <string name="action_display_options">Налаштування дисплея</string>
-    <string name="app_copyright_short">Авторські права © Sylvia van Os та вкладники</string>
+    <string name="action_display_options">Параметри відображення</string>
+    <string name="app_copyright_short">Авторські права © Sylvia van Os та співавтори</string>
     <string name="show_archived_cards">Показати архівовані картки</string>
     <string name="card_id_must_not_be_empty">ID картки не повинен бути порожнім</string>
     <string name="balanceParsingFailed">Неправильний баланс</string>
@@ -298,4 +298,16 @@
     <string name="field_must_not_be_empty">Поле вводу не повинно бути порожнім</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Завжди обертати (ігнорувати системні налаштування)</string>
+    <string name="add_manually_warning_message">У деяких магазинах значення штрихкоду відрізняється від номера, записаного на картці. Через це введення штрихкоду вручну може не завжди спрацювати. Наполегливо рекомендуємо відсканувати штрихкод за допомогою камери. Ви все ще хочете продовжити?</string>
+    <string name="continue_">Продовжити</string>
+    <string name="add_manually_warning_title">Рекомендується відсканувати</string>
+    <string name="failedLaunchingFileManager">Не вдалося знайти підтримуваний файловий менеджер</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Який зі знайдених штрих-кодів ви хочете використати?</string>
+    <string name="addFromPdfFile">Виберіть PDF файл</string>
+    <string name="errorReadingFile">Не вдалося прочитати файл</string>
+    <string name="pageWithNumber">Сторінка <xliff:g>%d</xliff:g></string>
+    <string name="spend">Витратити</string>
+    <string name="receive">Отримайте</string>
+    <string name="amountParsingFailed">Неправильна сума</string>
+    <string name="noCameraFoundGuideText">Ваш пристрій може не мати камери. перезавантажте пристрій, якщо це не так. В іншому випадку додайте штрих-код за допомогою кнопки \"Більше опцій\".</string>
 </resources>

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

@@ -86,7 +86,7 @@
     <string name="yes">Có</string>
     <string name="barcodeType">Loại mã vạch</string>
     <string name="enter_card_id">Nhập số ID hoặc văn bản lên thẻ của bạn</string>
-    <string name="unarchived">Thẻ đã được mở khóa</string>
+    <string name="unarchived">Đã hủy lưu trữ thẻ</string>
     <string name="noBarcode">Không có mã vạch</string>
     <string name="chooseValidFromDate">Chọn ngày hợp lệ</string>
     <string name="action_display_options">Tùy chỉnh hiển thị</string>
@@ -127,7 +127,7 @@
     <string name="settings_brown_theme">Màu nâu</string>
     <string name="app_copyright_short">Bản quyền © Sylvia van Os và các cộng sự</string>
     <string name="importExportHelp">Sao lưu cho phép bạn chuyển dữ liệu của mình đến thiết bị khác.</string>
-    <string name="settings_oled_dark">Màu nền đen xì cho chủ đề tối</string>
+    <string name="settings_oled_dark">Nền đen tuyền cho chủ đề tối</string>
     <string name="starred">Ưa thích</string>
     <string name="field_must_not_be_empty">Không được để ô trống</string>
     <string name="importOptionFilesystemExplanation">Chọn 1 tập tin cụ thể từ hệ thống (filesystem).</string>
@@ -228,7 +228,7 @@
     <string name="importSuccessful">Nhập dữ liệu xong</string>
     <string name="settings_card_orientation">Hướng đặt mã vạch</string>
     <string name="app_libraries">Thư viện mở từ bên thứ 3: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="updateBalanceTitle">Bạn đã chi bao nhiêu\?</string>
+    <string name="updateBalanceTitle">Bạn đã chi tiêu hoặc nhận được bao nhiêu?</string>
     <string name="editCardTitle">Sửa Thẻ</string>
     <string name="archive">Lưu trữ</string>
     <string name="settings_blue_theme">Màu xanh dương</string>
@@ -245,7 +245,7 @@
         <item quantity="other"><xliff:g>%d</xliff:g> thẻ</item>
     </plurals>
     <plurals name="selectedCardCount">
-        <item quantity="other">Chọn <xliff:g>%d</xliff:g></item>
+        <item quantity="other"><xliff:g>%d</xliff:g> đã được chọn</item>
     </plurals>
     <string name="version_history">Lịch Sử Phiên Bản</string>
     <string name="note">Ghi chú</string>
@@ -276,5 +276,17 @@
     <string name="failedToRetrieveImageFile">Không thể truy xuất tệp hình ảnh</string>
     <string name="app_contributors">Được thực hiện bởi: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="app_license">Phần mềm libre được bảo vệ bản quyền theo giấy phép GPLv3+.</string>
-    <string name="settings_follow_sensor_orientation">Luôn luôn xoay (bỏ qua cài đặt hệ thống)</string>
+    <string name="settings_follow_sensor_orientation">Luôn xoay (bỏ qua thiết đặt hệ thống)</string>
+    <string name="continue_">Tiếp tục</string>
+    <string name="add_manually_warning_title">Nên quét</string>
+    <string name="spend">Tiêu</string>
+    <string name="receive">Nhận được</string>
+    <string name="amountParsingFailed">Số tiền không hợp lệ</string>
+    <string name="add_manually_warning_message">Đối với một số cửa hàng, giá trị mã vạch khác với số ghi trên thẻ. Vì lý do này, việc nhập mã vạch theo cách thủ công không phải lúc nào cũng hiệu quả. Thay vào đó, bạn nên quét mã vạch bằng máy ảnh của mình. Bạn vẫn muốn tiếp tục chứ?</string>
+    <string name="addFromPdfFile">Chọn tệp PDF</string>
+    <string name="errorReadingFile">Không thể đọc tệp</string>
+    <string name="pageWithNumber">Page <xliff:g>%d</xliff:g></string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Bạn muốn sử dụng mã vạch nào được tìm thấy?</string>
+    <string name="failedLaunchingFileManager">Không thể tìm thấy trình quản lý tệp được hỗ trợ</string>
+    <string name="noCameraFoundGuideText">Có vẻ như thiết bị của bạn không có camera. Nếu có, hãy thử khởi động lại thiết bị. Nếu không, hãy sử dụng nút Tùy chọn khác bên dưới để thêm mã vạch theo cách khác.</string>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -227,7 +227,7 @@
         <item quantity="other">查看存档（<xliff:g>%1$d</xliff:g> 张卡片）</item>
     </plurals>
     <string name="updateBalance">更新余额</string>
-    <string name="updateBalanceTitle">你花了多少钱？</string>
+    <string name="updateBalanceTitle">你支出或者收到了多少钱？</string>
     <string name="currentBalanceSentence">当前余额：<xliff:g>%s</xliff:g></string>
     <string name="failedToRetrieveImageFile">无法检索图像文件</string>
     <string name="newBalanceSentence">新余额：<xliff:g>%s</xliff:g></string>
@@ -277,4 +277,16 @@
     <string name="field_must_not_be_empty">字段不能为空</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">始终旋转（忽略系统设置）</string>
+    <string name="add_manually_warning_title">建议扫描</string>
+    <string name="continue_">继续</string>
+    <string name="add_manually_warning_message">某些商店卡片的二维码值和刻在卡上的数字并不一样。由于这个原因，手动输入二维码可能并不总是有用。这种情况下，强烈建议你用相机扫描二维码。你仍要继续吗？</string>
+    <string name="receive">接收</string>
+    <string name="amountParsingFailed">无效金额</string>
+    <string name="spend">支出</string>
+    <string name="errorReadingFile">无法读取文件</string>
+    <string name="failedLaunchingFileManager">找不到支持的文件管理器</string>
+    <string name="pageWithNumber">第 <xliff:g>%d</xliff:g> 页</string>
+    <string name="addFromPdfFile">选择 PDF 文件</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">找到的多个条形码中，你希望使用哪个？</string>
+    <string name="noCameraFoundGuideText">你的设备似乎没有相机。如果的确如此，请尝试重启设备。否则，使用下方的“更多”按钮以另一种方式添加条形码。</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="action_search">搜尋</string>
     <string name="action_add">新增</string>
     <string name="noGiftCards">點選 + 按鈕以新增卡片，或從 ⋮ 選單中匯入。</string>
@@ -234,7 +234,7 @@
     <string name="cameraPermissionRequired">這個行動需要使用鏡頭的權限…</string>
     <string name="cameraPermissionDeniedTitle">不能使用鏡頭</string>
     <string name="updateBalance">更新餘額</string>
-    <string name="updateBalanceTitle">你用了多少？</string>
+    <string name="updateBalanceTitle">你花費或收到了多少錢？</string>
     <string name="updateBalanceHint">輸入金額</string>
     <string name="currentBalanceSentence">餘額：<xliff:g>%s</xliff:g></string>
     <string name="newBalanceSentence">新的餘額：<xliff:g>%s</xliff:g></string>
@@ -275,4 +275,17 @@
     <string name="enter_card_id">輸入卡片上的 ID 或文字</string>
     <string name="settings_display_barcode_max_brightness_summary">一些條碼掃描器需要此設定方能運作</string>
     <string name="field_must_not_be_empty">欄位不能為空</string>
+    <string name="settings_follow_sensor_orientation">始終旋轉（忽略系統設定）</string>
+    <string name="add_manually_warning_title">建議掃描</string>
+    <string name="failedLaunchingFileManager">找不到支援的檔案管理器</string>
+    <string name="addFromPdfFile">選擇一個 PDF 檔案</string>
+    <string name="errorReadingFile">無法讀取此檔案</string>
+    <string name="receive">接收</string>
+    <string name="amountParsingFailed">無效的數值</string>
+    <string name="continue_">繼續</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">你想要使用哪個找到的條碼？</string>
+    <string name="pageWithNumber">第 <xliff:g>%d</xliff:g> 頁</string>
+    <string name="add_manually_warning_message">對於某些商店，條碼值與卡片上寫的數字並不相同。因此，手動輸入條碼可能並不總是有效。強烈建議使用相機掃描條碼。你還想繼續嗎？</string>
+    <string name="spend">花費</string>
+    <string name="noCameraFoundGuideText">您的裝置似乎沒有相機鏡頭。如果實際上有相機鏡頭，請嘗試重新啟動此裝置，否則請點選下方的「更多」按鈕，以其它方式新增條碼。</string>
 </resources>

app/src/main/res/values/settings.xml

@@ -81,7 +81,9 @@
         <item>eo</item>
         <item>es</item>
         <item>es-rAR</item>
+        <!-- <item>fa</item> -->
         <item>fi</item>
+        <!-- <item>fil</item> -->
         <item>fr</item>
         <item>he-rIL</item>
         <item>hi</item>
@@ -102,6 +104,7 @@
         <item>nl</item>
         <item>oc</item>
         <item>pl</item>
+        <item>pt-rBR</item>
         <item>pt-rPT</item>
         <item>ro-rRO</item>
         <item>ru</item>

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

@@ -296,7 +296,7 @@
     </plurals>
     <string name="welcome">Welcome to Catima</string>
     <string name="importCards">Import cards</string>
-    <string name="updateBalanceTitle">How much did you spend?</string>
+    <string name="updateBalanceTitle">How much did you spend or receive?</string>
     <string name="updateBalanceHint">Enter amount</string>
     <string name="currentBalanceSentence">Current balance: <xliff:g>%s</xliff:g></string>
     <string name="newBalanceSentence">New balance: <xliff:g>%s</xliff:g></string>
@@ -335,4 +335,16 @@
     <string name="add_a_card_in_a_different_way">Add a card in a different way</string>
     <string name="field_must_not_be_empty">Field must not be empty</string>
     <string name="manually_enter_barcode_instructions">Enter the ID number or text on your card and press the barcode that looks like the one on your card.</string>
+    <string name="add_manually_warning_title">Scanning is recommended</string>
+    <string name="add_manually_warning_message">For some stores, the barcode value differs from the number written on the card. Because of this, entering a barcode manually may not always work. It is strongly recommended to scan the barcode with your camera instead. Do you still want to continue?</string>
+    <string name="continue_">Continue</string>
+    <string name="spend">Spend</string>
+    <string name="receive">Receive</string>
+    <string name="amountParsingFailed">Invalid amount</string>
+    <string name="addFromPdfFile">Select a PDF file</string>
+    <string name="errorReadingFile">Could not read the file</string>
+    <string name="failedLaunchingFileManager">Could not find a supported file manager</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Which of the found barcodes do you want to use?</string>
+    <string name="pageWithNumber">Page <xliff:g>%d</xliff:g></string>
+    <string name="noCameraFoundGuideText">Your device does not seem to have a camera. If it does, try rebooting the device. Otherwise, use the "More options" button below to add a barcode another way.</string>
 </resources>

app/src/main/res/xml/locales_config.xml

@@ -30,6 +30,7 @@
     <locale android:name="nl" />
     <locale android:name="oc" />
     <locale android:name="pl" />
+    <locale android:name="pt-BR" />
     <locale android:name="pt-PT" />
     <locale android:name="ro-RO" />
     <locale android:name="ru" />

app/src/test/java/protect/card_locker/BarcodeSelectorActivityTest.java

@@ -1,9 +1,8 @@
 package protect.card_locker;
 
+import static org.junit.Assert.assertEquals;
+
 import android.app.Activity;
-import android.content.Intent;
-import android.view.View;
-import android.widget.Button;
 import android.widget.TextView;
 
 import org.junit.Test;
@@ -11,12 +10,6 @@ import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.android.controller.ActivityController;
-import org.robolectric.shadows.ShadowLooper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.robolectric.Shadows.shadowOf;
 
 
 @RunWith(RobolectricTestRunner.class)

app/src/test/java/protect/card_locker/DatabaseTest.java

@@ -1,5 +1,11 @@
 package protect.card_locker;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import android.app.Activity;
 import android.content.ContentValues;
 import android.database.Cursor;
@@ -13,19 +19,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Currency;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 @RunWith(RobolectricTestRunner.class)
 public class DatabaseTest {
     private SQLiteDatabase mDatabase;

app/src/test/java/protect/card_locker/ImportExportActivityTest.java

@@ -1,5 +1,8 @@
 package protect.card_locker;
 
+import static org.junit.Assert.assertEquals;
+import static org.robolectric.Shadows.shadowOf;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -14,9 +17,6 @@ import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-import static org.junit.Assert.assertEquals;
-import static org.robolectric.Shadows.shadowOf;
-
 @RunWith(RobolectricTestRunner.class)
 public class ImportExportActivityTest {
     private void registerIntentHandler(String handler) {

app/src/test/java/protect/card_locker/ImportExportTest.java

@@ -1,5 +1,11 @@
 package protect.card_locker;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.robolectric.Shadows.shadowOf;
+
 import android.app.Activity;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
@@ -45,12 +51,6 @@ import protect.card_locker.importexport.ImportExportResultType;
 import protect.card_locker.importexport.MultiFormatExporter;
 import protect.card_locker.importexport.MultiFormatImporter;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.robolectric.Shadows.shadowOf;
-
 @RunWith(RobolectricTestRunner.class)
 public class ImportExportTest {
     private Activity activity;