Codedump

Currently translated at 98.3% (294 of 299 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/pt/

.github/dependabot.yml

@@ -1,11 +1,10 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
 version: 2
 updates:
-  - package-ecosystem: "gradle" # See documentation for possible values
-    directory: "/" # Location of package manifests
+  - package-ecosystem: "gradle"
+    directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/android.yml

@@ -1,6 +1,6 @@
 name: Android CI
-
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
@@ -9,17 +9,27 @@ on:
   pull_request:
     branches:
       - main
-
+permissions:
+  actions: none
+  checks: none
+  contents: read
+  deployments: none
+  discussions: none
+  id-token: none
+  issues: none
+  packages: none
+  pages: none
+  pull-requests: none
+  repository-projects: none
+  security-events: none
+  statuses: none
 env:
   JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
-
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4.0.0
     - 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
@@ -38,7 +48,7 @@ jobs:
       run: ./gradlew spotbugsRelease
     - name: Archive test results
       if: always()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3.1.3
       with:
         name: test-results
         path: app/build/reports

.github/workflows/autoclose-needs-info.yml

@@ -1,22 +0,0 @@
-name: 'Close issues and PRs needing info for too long'
-on:
-  schedule:
-    - cron: '30 1 * * *'
-
-permissions:
-  issues: write
-  pull-requests: write
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v4
-        with:
-          days-before-close: 90
-          stale-issue-message: ""
-          stale-pr-message: ""
-          close-issue-message: 'This issue is missing necessary information and cannot be worked on in its current state. It has therefore been closed to keep the issue tracker clean. If you have more information, feel free to reopen it.'
-          close-pr-message: 'This PR is missing necessary information and cannot be merged in its current state. It has therefore been closed to keep the issue tracker clean. If you have more information, feel free to reopen it.'
-          only-labels: 'state: needs info'
-          enable-statistics: true

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

@@ -1,34 +0,0 @@
-name: Compress Images on Push to Main
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '**.jpg'
-      - '**.jpeg'
-      - '**.png'
-      - '**.webp'
-jobs:
-  build:
-    # Only run on Pull Requests within the same repository, and not from forks.
-    if: github.event.pull_request.head.repo.full_name == github.repository
-    name: calibreapp/image-actions
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v2
-      - name: Compress Images
-        id: calibre
-        uses: calibreapp/image-actions@1.1.0
-        with:
-          githubToken: ${{ secrets.GITHUB_TOKEN }}
-          ignorePaths: 'app/src/test'
-          compressOnly: true
-      - name: Create New Pull Request If Needed
-        if: steps.calibre.outputs.markdown != ''
-        uses: peter-evans/create-pull-request@v3
-        with:
-          title: Compressed Images
-          branch-suffix: timestamp
-          commit-message: Compressed Images
-          body: ${{ steps.calibre.outputs.markdown }}

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

@@ -1,9 +1,25 @@
 name: Convert CHANGELOG to Fastlane
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
-
+    paths:
+      - 'CHANGELOG.md'
+permissions:
+  actions: none
+  checks: none
+  contents: write
+  deployments: none
+  discussions: none
+  id-token: none
+  issues: none
+  packages: none
+  pages: none
+  pull-requests: write
+  repository-projects: none
+  security-events: none
+  statuses: none
 jobs:
   convert_changelog_to_fastlane:
     runs-on: ubuntu-latest
@@ -11,15 +27,15 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4.0.0
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4.7.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@v3
+      uses: peter-evans/create-pull-request@v5.0.2
       with:
         title: "Update Fastlane changelogs"
         commit-message: "Update Fastlane changelogs"

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

@@ -1,8 +1,22 @@
 name: Write contributors to file
 on:
+  workflow_dispatch:
   schedule:
     - cron: '3 4 * * 0'
-
+permissions:
+  actions: none
+  checks: none
+  contents: write
+  deployments: none
+  discussions: none
+  id-token: none
+  issues: none
+  packages: none
+  pages: none
+  pull-requests: write
+  repository-projects: none
+  security-events: none
+  statuses: none
 jobs:
   contributors_to_file:
     runs-on: ubuntu-latest
@@ -11,14 +25,14 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4.0.0
     - name: Update contributors
       id: update_contributors
-      uses: TheLastProject/contributors-to-file-action@v2
+      uses: TheLastProject/contributors-to-file-action@v3.0.1
       with:
         file_in_repo: app/src/main/res/raw/contributors.txt
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v3
+      uses: peter-evans/create-pull-request@v5.0.2
       with:
         title: "Update contributors"
         commit-message: "Update contributors"

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

@@ -0,0 +1,77 @@
+name: Generate feature graphic
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - 'fastlane/**/title.txt'
+permissions:
+  actions: none
+  checks: none
+  contents: write
+  deployments: none
+  discussions: none
+  id-token: none
+  issues: none
+  packages: none
+  pages: none
+  pull-requests: write
+  repository-projects: none
+  security-events: none
+  statuses: none
+jobs:
+  generate-feature-graphic:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4.0.0
+    - name: Install requirements
+      run: |
+        sudo apt-get update
+        sudo apt-get install optipng mat2
+        # Install 200 weight versions of relevant Noto (to use for languages not supported by Lexend Deca)
+        sudo apt-get install fonts-noto-extra fonts-noto-cjk-extra
+        # Custom fonts
+        mkdir "$HOME/.fonts"
+        find .scripts/generate_feature_graphic/fonts -name '*.ttf' -exec cp {} "$HOME/.fonts" \;
+        fc-cache
+    - name: Generate featureGraphic.png for each language
+      run: |
+        for lang in fastlane/metadata/android/*; do
+          pushd "$lang"
+          # Place temporary copy for editing if needed
+          cp ../../../../.scripts/generate_feature_graphic/featureGraphic.svg featureGraphic.svg
+          # Extract text after 'Catima - '
+          export subtext="$(grep -oP '(?<=Catima \S ).*' title.txt || true)"
+          # If there is subtext, change the .svg accordingly
+          if [ -n "$subtext" ]; then
+            perl -pi -e 's/Loyalty Card Wallet/$ENV{subtext}/' featureGraphic.svg
+            # Set correct font for language if needed (Lexend Deca has limited support)
+            # 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 ;;
+              ja-JP) sed -i "s/Lexend Deca/Noto Serif CJK JP/" featureGraphic.svg ;;
+              ko) sed -i "s/Lexend Deca/Noto Serif CJK KR/" 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 ;;
+              *) ;;
+            esac
+          fi
+          # Ensure images directory exists
+          mkdir -p images
+          # Generate .png
+          convert featureGraphic.svg images/featureGraphic.png
+          # Optimize .png
+          optipng images/featureGraphic.png
+          # Remove metadata (timestamps) from .png
+          mat2 --inplace images/featureGraphic.png
+          # Remove temporary .svg
+          rm featureGraphic.svg
+          popd
+        done
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v5.0.2
+      with:
+        title: "Update feature graphic"
+        commit-message: "Update feature graphic"
+        branch-suffix: timestamp

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

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

.github/workflows/update-locales.yml

@@ -0,0 +1,35 @@
+name: Update locales
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - app/src/main/res/values/settings.xml
+permissions:
+  actions: none
+  checks: none
+  contents: write
+  deployments: none
+  discussions: none
+  id-token: none
+  issues: none
+  packages: none
+  pages: none
+  pull-requests: write
+  repository-projects: none
+  security-events: none
+  statuses: none
+jobs:
+  update-locales:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4.0.0
+    - name: Update locales
+      run: .scripts/locales.py
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v5.0.2
+      with:
+        title: "Update locales"
+        commit-message: "Update locales"
+        branch-suffix: timestamp

.scripts/generate_feature_graphic/featureGraphic.svg

@@ -0,0 +1,15 @@
+<svg width="1024" height="500" viewBox="0 0 1024 500" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="1024" height="500" fill="#223355"/>
+<text fill="white" xml:space="preserve" style="" font-family="Yesteryear" font-size="150" letter-spacing="0em"><tspan x="470.082" y="285.511">Catima
+</tspan></text>
+<path d="M381.046 147.001L236.3 211.446L276.524 301.79L421.27 237.345L381.046 147.001Z" fill="#F0F0F0" stroke="#C80000" stroke-width="2"/>
+<path d="M402.077 219.13L240.07 147L191.984 255.004L353.99 327.135L402.077 219.13Z" fill="#F0F0F0" stroke="#C80000" stroke-width="2"/>
+<path d="M437.17 236.241L251.831 183.096L220.071 293.855L405.41 347L437.17 236.241Z" fill="#C80000" stroke="#C80000" stroke-width="6" stroke-linejoin="round"/>
+<path d="M412.879 178.633H220.071V293.855H412.879V178.633Z" fill="#FF0000" stroke="#FF0000" stroke-width="6" stroke-linejoin="round"/>
+<path d="M221.482 296.217C238.316 296.217 251.963 269.366 251.963 236.244C251.963 203.121 238.316 176.27 221.482 176.27C204.647 176.27 191 203.121 191 236.244C191 269.366 204.647 296.217 221.482 296.217Z" fill="#FF0000" stroke="#FF0000" stroke-width="3.44232" stroke-linejoin="round"/>
+<path d="M307.256 250.444C307.256 253.187 306.289 255.842 304.526 257.944C302.763 260.045 300.316 261.458 297.614 261.934C294.913 262.41 292.13 261.92 289.755 260.548C287.379 259.177 285.563 257.012 284.625 254.435" stroke="#F0F0F0" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M330.301 254.298C329.363 256.875 327.547 259.04 325.171 260.411C322.796 261.783 320.013 262.273 317.312 261.797C314.61 261.321 312.163 259.908 310.4 257.807C308.637 255.706 307.671 253.05 307.671 250.307" stroke="#F0F0F0" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M248.345 225.937L266.818 207.465L285.29 225.937" stroke="#F0F0F0" stroke-width="2"/>
+<path d="M329.625 225.937L348.098 207.465L366.571 225.937" stroke="#F0F0F0" stroke-width="2"/>
+<text fill="white" xml:space="preserve" style="" font-family="Lexend Deca" font-size="35" font-weight="200" letter-spacing="0em"><tspan x="466" y="340">Loyalty Card Wallet</tspan></text>
+</svg>

.scripts/generate_feature_graphic/fonts/Lexend_Deca/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2018 The Lexend Project Authors (https://github.com/googlefonts/lexend), with Reserved Font Name “RevReading Lexend”.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

.scripts/generate_feature_graphic/fonts/Yesteryear/OFL.txt

@@ -0,0 +1,94 @@
+Copyright (c) 2011 by Brian J. Bonislawsky DBA Astigmatic (AOETI)
+(astigma@astigmatic.com), with Reserved Font Names "Yesteryear"
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

.scripts/locales.py

@@ -0,0 +1,36 @@
+#!/usr/bin/python3
+
+import subprocess
+import xml.etree.ElementTree as ET
+
+root = ET.parse("app/src/main/res/values/settings.xml").getroot()
+for e in root.findall("string-array"):
+    if e.get("name") == "locale_values":
+        locales = [x.text for x in e if x.text]
+        break
+
+locales = [
+    # e.g. de or es-rAR (not es-AR)
+    loc.replace("-", "-r") if "-" in loc and loc[loc.index("-") + 1] != "r" else loc
+    for loc in locales
+]
+
+res = ", ".join(f'"{loc}"' for loc in locales)
+sed = [
+    "sed",
+    "-i",
+    f"s/resourceConfigurations .*/resourceConfigurations += [{res}]/",
+    "app/build.gradle"
+]
+subprocess.run(sed, check=True)
+
+with open("app/src/main/res/xml/locales_config.xml", "w") 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')
+    for loc in locales:
+        if loc != "en":
+            # e.g. de or en-AR (not es-rAR)
+            loc = loc.replace("-r", "-")
+            fh.write(f'    <locale android:name="{loc}" />\n')
+    fh.write('</locale-config>\n')

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## Unreleased - 132
+
+- Refine "Add card" workflow
+- Validation flow improvements
+
+## v2.26.0 - 131 (2023-09-14)
+
+- Move "Archive mode" into "Display options" (previously "Show details") menu
+- Android 13 per-app language support
+- Embed privacy policy, changelog and license in the app
+
 ## v2.25.3 - 130 (2023-08-25)
 
 - Minor UI fixes

Gemfile.lock

@@ -3,13 +3,13 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    addressable (2.8.4)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.793.0)
-    aws-sdk-core (3.180.0)
+    aws-partitions (1.824.0)
+    aws-sdk-core (3.181.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
@@ -17,8 +17,8 @@ GEM
     aws-sdk-kms (1.71.0)
       aws-sdk-core (~> 3, >= 3.177.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.132.0)
-      aws-sdk-core (~> 3, >= 3.179.0)
+    aws-sdk-s3 (1.134.0)
+      aws-sdk-core (~> 3, >= 3.181.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)
     aws-sigv4 (1.6.0)
@@ -36,7 +36,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.100.0)
+    excon (0.103.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -66,7 +66,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.7)
-    fastlane (2.214.0)
+    fastlane (2.215.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -87,6 +87,7 @@ GEM
       google-apis-playcustomapp_v1 (~> 0.1)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
@@ -98,7 +99,7 @@ GEM
       security (= 0.1.3)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
@@ -106,7 +107,7 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.46.0)
+    google-apis-androidpublisher_v3 (0.49.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.11.1)
       addressable (~> 2.5, >= 2.5.1)
@@ -137,10 +138,9 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.7.0)
+    googleauth (1.8.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
@@ -151,9 +151,8 @@ GEM
     jmespath (1.6.2)
     json (2.6.3)
     jwt (2.7.1)
-    memoist (0.16.2)
     mini_magick (4.12.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
     multi_json (1.15.0)
     multipart-post (2.3.0)
     nanaimo (0.3.0)
@@ -173,7 +172,7 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.17.0)
+    signet (0.18.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -182,8 +181,8 @@ GEM
       CFPropertyList
       naturally
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    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)
@@ -193,7 +192,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.4.2)
     webrick (1.8.1)
     word_wrap (1.0.0)
     xcodeproj (1.22.0)

PRIVACY.md

@@ -0,0 +1,18 @@
+**Last updated**  
+August 30 2023
+
+# Privacy Policy
+Catima does not collect or transmit any personal information.
+
+To ensure correct app functionality, we require access to the following:
+
+- Camera: We need access to your camera to be able to scan barcodes. The app can still be used when camera access is denied, but you will have to manually type the barcode information.
+- Storage (Android 5 and 6 only): We need access to your device storage to create or import backups. The app can still be used when storage access is denied, but you will not be able to create or import backups.
+
+Catima offers a feature to share cards with other users. All the relevant data is in the generated shareable URLs and never transmitted to our servers. When viewed through catima.app, the data in the URL is rendered using client-side Javascript to further ensure no data is ever transmitted to us.
+
+# Changes
+This Privacy Policy may be updated from time to time for any reason. We will notify you of any changes to our Privacy Policy by posting the new Privacy Policy to https://catima.app/privacy-policy/. A snapshot of the Privacy Policy is available within the Catima app, though it may be outdated. When the Privacy Policy on the website and in the app differ, the website should be considered leading. You are advised to consult the Privacy Policy regularly for any changes, as continued use is deemed approval of all changes.
+
+# Contact us
+If you have any questions regarding privacy while using the Application, or have questions about our practices, please contact us via email at catima.g9ex3@hackerchick.me.

app/build.gradle

@@ -19,11 +19,26 @@ android {
         applicationId "me.hackerchick.catima"
         minSdk 21
         targetSdk 33
-        versionCode 130
-        versionName "2.25.3"
+        versionCode 131
+        versionName "2.26.0"
 
         vectorDrawables.useSupportLibrary true
         multiDexEnabled true
+
+        resourceConfigurations += ["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", "ro-rRO", "ru", "sk", "sl", "sv", "tr", "uk", "zh-rTW", "zh-rCN"]
+
+        //testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    flavorDimensions "version"
+    productFlavors {
+        fdroid {
+            dimension "version"
+        }
+        screengrab {
+            dimension "version"
+            applicationIdSuffix = ".screengrab"
+        }
     }
 
     buildTypes {
@@ -111,6 +126,12 @@ dependencies {
     testImplementation 'androidx.test:core:1.5.0'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.robolectric:robolectric:4.10.3'
+
+    // Screenshots
+    testImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    testImplementation 'com.android.support.test:rules:1.0.2'
+    testImplementation 'com.android.support.test:runner:1.0.2'
+    testImplementation 'tools.fastlane:screengrab:2.1.1'
 }
 
 tasks.withType(SpotBugsTask) {
@@ -127,3 +148,18 @@ tasks.withType(SpotBugsTask) {
         html.enabled = true
     }
 }
+
+tasks.register('copyRawResFiles', Copy) {
+    from layout.projectDirectory.file("../CHANGELOG.md"),
+         layout.projectDirectory.file("../PRIVACY.md")
+    into layout.projectDirectory.dir("src/main/res/raw")
+    rename { String fileName -> fileName.toLowerCase() }
+}
+
+project.afterEvaluate {
+    tasks.each { task ->
+        if (task != copyRawResFiles) {
+            task.dependsOn(copyRawResFiles)
+        }
+    }
+}

app/src/main/AndroidManifest.xml

@@ -27,7 +27,8 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:localeConfig="@xml/locales_config">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -184,4 +185,4 @@
             </intent-filter>
         </service>
     </application>
-</manifest>
+</manifest>

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

@@ -1,10 +1,14 @@
 package protect.card_locker;
 
 import android.os.Bundle;
+import android.text.Spanned;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
+import androidx.annotation.StringRes;
+
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 
@@ -28,7 +32,7 @@ public class AboutActivity extends CatimaAppCompatActivity {
         enableToolbarBackButton();
 
         TextView copyright = binding.creditsSub;
-        copyright.setText(content.getCopyright());
+        copyright.setText(content.getCopyrightShort());
         TextView versionHistory = binding.versionHistorySub;
         versionHistory.setText(content.getVersionHistory());
 
@@ -68,20 +72,14 @@ public class AboutActivity extends CatimaAppCompatActivity {
     }
 
     private void bindClickListeners() {
-        View.OnClickListener openExternalBrowser = view -> {
-            Object tag = view.getTag();
-            if (tag instanceof String && ((String) tag).startsWith("https://")) {
-                (new OpenWebLinkHandler()).openBrowser(this, (String) tag);
-            }
-        };
-        binding.versionHistory.setOnClickListener(openExternalBrowser);
-        binding.translate.setOnClickListener(openExternalBrowser);
-        binding.license.setOnClickListener(openExternalBrowser);
-        binding.repo.setOnClickListener(openExternalBrowser);
-        binding.privacy.setOnClickListener(openExternalBrowser);
-        binding.reportError.setOnClickListener(openExternalBrowser);
-        binding.rate.setOnClickListener(openExternalBrowser);
-        binding.donate.setOnClickListener(openExternalBrowser);
+        binding.versionHistory.setOnClickListener(this::showHistory);
+        binding.translate.setOnClickListener(this::openExternalBrowser);
+        binding.license.setOnClickListener(this::showLicense);
+        binding.repo.setOnClickListener(this::openExternalBrowser);
+        binding.privacy.setOnClickListener(this::showPrivacy);
+        binding.reportError.setOnClickListener(this::openExternalBrowser);
+        binding.rate.setOnClickListener(this::openExternalBrowser);
+        binding.donate.setOnClickListener(this::openExternalBrowser);
 
         binding.credits.setOnClickListener(view -> showCredits());
     }
@@ -106,4 +104,39 @@ public class AboutActivity extends CatimaAppCompatActivity {
                 .setPositiveButton(R.string.ok, null)
                 .show();
     }
+
+    private void showHistory(View view) {
+        showHTML(R.string.version_history, content.getHistoryInfo(), view);
+    }
+
+    private void showLicense(View view) {
+        showHTML(R.string.license, content.getLicenseInfo(), view);
+    }
+
+    private void showPrivacy(View view) {
+        showHTML(R.string.privacy_policy, content.getPrivacyInfo(), view);
+    }
+
+    private void showHTML(@StringRes int title, final Spanned text, View view) {
+        int dialogContentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
+        TextView textView = new TextView(this);
+        textView.setText(text);
+        Utils.makeTextViewLinksClickable(textView, text);
+        ScrollView scrollView = new ScrollView(this);
+        scrollView.addView(textView);
+        scrollView.setPadding(dialogContentPadding, dialogContentPadding / 2, dialogContentPadding, 0);
+        new MaterialAlertDialogBuilder(this)
+                .setTitle(title)
+                .setView(scrollView)
+                .setPositiveButton(R.string.ok, null)
+                .setNeutralButton(R.string.view_online, (dialog, which) -> openExternalBrowser(view))
+                .show();
+    }
+
+    private void openExternalBrowser(View view) {
+        Object tag = view.getTag();
+        if (tag instanceof String && ((String) tag).startsWith("https://")) {
+            (new OpenWebLinkHandler()).openBrowser(this, (String) tag);
+        }
+    }
 }

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

@@ -3,6 +3,7 @@ package protect.card_locker;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.text.Spanned;
 import android.util.Log;
 
 import androidx.core.text.HtmlCompat;
@@ -50,6 +51,10 @@ public class AboutContent {
         return String.format(context.getString(R.string.app_copyright_fmt), getCurrentYear());
     }
 
+    public String getCopyrightShort() {
+        return context.getString(R.string.app_copyright_short);
+    }
+
     public String getContributors() {
         String contributors;
         try {
@@ -60,6 +65,38 @@ public class AboutContent {
         return contributors.replace("\n", "<br />");
     }
 
+    public String getHistory() {
+        String versionHistory;
+        try {
+            versionHistory = Utils.readTextFile(context, R.raw.changelog)
+                    .replace("# Changelog\n\n", "");
+        }  catch (IOException ignored) {
+            return "";
+        }
+        return Utils.linkify(Utils.basicMDToHTML(versionHistory))
+                .replace("\n", "<br />");
+    }
+
+    public String getLicense() {
+        try {
+            return Utils.readTextFile(context, R.raw.license);
+        }  catch (IOException ignored) {
+            return "";
+        }
+    }
+
+    public String getPrivacy() {
+        String privacyPolicy;
+        try {
+            privacyPolicy = Utils.readTextFile(context, R.raw.privacy)
+                    .replace("# Privacy Policy\n", "");
+        }  catch (IOException ignored) {
+            return "";
+        }
+        return Utils.linkify(Utils.basicMDToHTML(privacyPolicy))
+                .replace("\n", "<br />");
+    }
+
     public String getThirdPartyLibraries() {
         final List<ThirdPartyInfo> usedLibraries = new ArrayList<>();
         usedLibraries.add(new ThirdPartyInfo("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
@@ -107,6 +144,18 @@ public class AboutContent {
         return contributorInfo.toString();
     }
 
+    public Spanned getHistoryInfo() {
+        return HtmlCompat.fromHtml(getHistory(), HtmlCompat.FROM_HTML_MODE_COMPACT);
+    }
+
+    public Spanned getLicenseInfo() {
+        return HtmlCompat.fromHtml(getLicense(), HtmlCompat.FROM_HTML_MODE_LEGACY);
+    }
+
+    public Spanned getPrivacyInfo() {
+        return HtmlCompat.fromHtml(getPrivacy(), HtmlCompat.FROM_HTML_MODE_COMPACT);
+    }
+
     public String getVersionHistory() {
         return String.format(context.getString(R.string.debug_version_fmt), getAppVersion());
     }

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

@@ -16,7 +16,6 @@ import com.google.zxing.BarcodeFormat;
 
 import java.util.ArrayList;
 
-import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
 
 import protect.card_locker.databinding.BarcodeSelectorActivityBinding;
@@ -66,10 +65,6 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements
 
                     runOnUiThread(() -> {
                         generateBarcodes(s.toString());
-
-                        View noBarcodeButtonView = binding.noBarcode;
-                        setButtonListener(noBarcodeButtonView, s.toString());
-                        noBarcodeButtonView.setEnabled(s.length() > 0);
                     });
                 }, INPUT_DELAY);
             }
@@ -95,17 +90,6 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements
         mAdapter.setBarcodes(barcodes);
     }
 
-    private void setButtonListener(final View button, final String cardId) {
-        button.setOnClickListener(view -> {
-            Log.d(TAG, "Selected no barcode");
-            Intent result = new Intent();
-            result.putExtra(BARCODE_FORMAT, "");
-            result.putExtra(BARCODE_CONTENTS, cardId);
-            BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
-            finish();
-        });
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {

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

@@ -47,25 +47,19 @@ public class CardShortcutConfigure extends CatimaAppCompatActivity implements Lo
             finish();
         }
 
-        // If all cards are archived, bail
-        if (DBHelper.getArchivedCardsCount(mDatabase) == cardCount) {
-            Toast.makeText(this, R.string.noUnarchivedCardsMessage, Toast.LENGTH_LONG).show();
-            finish();
-        }
-
         final RecyclerView cardList = binding.list;
         GridLayoutManager layoutManager = (GridLayoutManager) cardList.getLayoutManager();
         if (layoutManager != null) {
             layoutManager.setSpanCount(getResources().getInteger(R.integer.main_view_card_columns));
         }
 
-        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
-        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
+        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.All);
+        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this, null);
         cardList.setAdapter(mAdapter);
     }
 
     private void onClickAction(int position) {
-        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
+        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.All);
         selected.moveToPosition(position);
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
 
@@ -89,8 +83,8 @@ public class CardShortcutConfigure extends CatimaAppCompatActivity implements Lo
     public boolean onOptionsItemSelected(MenuItem inputItem) {
         int id = inputItem.getItemId();
 
-        if (id == R.id.action_shown_details) {
-            mAdapter.showSelectDetailDisplayDialog();
+        if (id == R.id.action_display_options) {
+            mAdapter.showDisplayOptionsDialog();
             invalidateOptionsMenu();
 
             return true;

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

@@ -1,7 +1,6 @@
 package protect.card_locker;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -18,14 +17,12 @@ import android.widget.TextView;
 
 import com.google.android.material.card.MaterialCardView;
 import com.google.android.material.color.MaterialColors;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.util.ArrayList;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.BlendModeColorFilterCompat;
@@ -39,123 +36,34 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
     boolean mDarkModeEnabled;
     public final Context mContext;
     private final CardAdapterListener mListener;
+    private final LoyaltyCardListDisplayOptionsManager mLoyaltyCardListDisplayOptions;
     protected SparseBooleanArray mSelectedItems;
     protected SparseBooleanArray mAnimationItemsIndex;
     private boolean mReverseAllAnimations = false;
-    private boolean mShowNameBelowThumbnail;
-    private boolean mShowNote;
-    private boolean mShowBalance;
-    private boolean mShowValidity;
 
-    public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener) {
+    public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener, Runnable inputSwapCursorCallback) {
         super(inputCursor, DBHelper.LoyaltyCardDbIds.ID);
         setHasStableIds(true);
         mContext = inputContext;
         mListener = inputListener;
+
+        Runnable refreshCardsCallback = () -> notifyDataSetChanged();
+
+        mLoyaltyCardListDisplayOptions = new LoyaltyCardListDisplayOptionsManager(mContext, refreshCardsCallback, inputSwapCursorCallback);
         mSelectedItems = new SparseBooleanArray();
         mAnimationItemsIndex = new SparseBooleanArray();
 
         mDarkModeEnabled = Utils.isDarkModeEnabled(inputContext);
 
-        refreshState();
-
         swapCursor(inputCursor);
     }
 
-    private void saveDetailState(int stateId, boolean value) {
-        SharedPreferences cardDetailsPref = mContext.getSharedPreferences(
-                mContext.getString(R.string.sharedpreference_card_details),
-                Context.MODE_PRIVATE);
-        SharedPreferences.Editor cardDetailsPrefEditor = cardDetailsPref.edit();
-        cardDetailsPrefEditor.putBoolean(mContext.getString(stateId), value);
-        cardDetailsPrefEditor.apply();
+    public void showDisplayOptionsDialog() {
+        mLoyaltyCardListDisplayOptions.showDisplayOptionsDialog();
     }
 
-    public void refreshState() {
-        // Retrieve user details preference
-        SharedPreferences cardDetailsPref = mContext.getSharedPreferences(
-                mContext.getString(R.string.sharedpreference_card_details),
-                Context.MODE_PRIVATE);
-        mShowNameBelowThumbnail = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_name_below_thumbnail), false);
-        mShowNote = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_note), true);
-        mShowBalance = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_balance), true);
-        mShowValidity = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_validity), true);
-    }
-
-    public void showNameBelowThumbnail(boolean show) {
-        mShowNameBelowThumbnail = show;
-        notifyDataSetChanged();
-
-        saveDetailState(R.string.sharedpreference_card_details_show_name_below_thumbnail, show);
-    }
-
-    public boolean showingNameBelowThumbnail() {
-        return mShowNameBelowThumbnail;
-    }
-
-    public void showNote(boolean show) {
-        mShowNote = show;
-        notifyDataSetChanged();
-
-        saveDetailState(R.string.sharedpreference_card_details_show_note, show);
-    }
-
-    public boolean showingNote() {
-        return mShowNote;
-    }
-
-    public void showBalance(boolean show) {
-        mShowBalance = show;
-        notifyDataSetChanged();
-
-        saveDetailState(R.string.sharedpreference_card_details_show_balance, show);
-    }
-
-    public boolean showingBalance() {
-        return mShowBalance;
-    }
-
-    public void showValidity(boolean show) {
-        mShowValidity = show;
-        notifyDataSetChanged();
-
-        saveDetailState(R.string.sharedpreference_card_details_show_validity, show);
-    }
-
-    public boolean showingValidity() {
-        return mShowValidity;
-    }
-
-    public void showSelectDetailDisplayDialog() {
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(mContext);
-        builder.setTitle(R.string.action_show_details);
-        builder.setMultiChoiceItems(
-                new String[]{
-                        mContext.getString(R.string.show_name_below_image_thumbnail),
-                        mContext.getString(R.string.show_note),
-                        mContext.getString(R.string.show_balance),
-                        mContext.getString(R.string.show_validity)
-                },
-                new boolean[]{
-                        showingNameBelowThumbnail(),
-                        showingNote(),
-                        showingBalance(),
-                        showingValidity()
-                },
-                (dialogInterface, i, b) -> {
-                    switch (i) {
-                        case 0: showNameBelowThumbnail(b); break;
-                        case 1: showNote(b); break;
-                        case 2: showBalance(b); break;
-                        case 3: showValidity(b); break;
-                        default: throw new IndexOutOfBoundsException("No such index exists in LoyaltyCardCursorAdapter show details view");
-                    }
-                }
-        );
-        builder.setPositiveButton(R.string.ok, (dialog, i) -> dialog.dismiss());
-
-        AlertDialog dialog = builder.create();
-        dialog.show();
+    public boolean showingArchivedCards() {
+        return mLoyaltyCardListDisplayOptions.showingArchivedCards();
     }
 
     @NonNull
@@ -182,33 +90,33 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
         Bitmap icon = Utils.retrieveCardImage(mContext, loyaltyCard.id, ImageLocationType.icon);
 
-        if (mShowNameBelowThumbnail && icon != null) {
+        if (mLoyaltyCardListDisplayOptions.showingNameBelowThumbnail() && icon != null) {
             showDivider = true;
             inputHolder.setStoreField(loyaltyCard.store);
         } else {
             inputHolder.setStoreField(null);
         }
 
-        if (mShowNote && !loyaltyCard.note.isEmpty()) {
+        if (mLoyaltyCardListDisplayOptions.showingNote() && !loyaltyCard.note.isEmpty()) {
             showDivider = true;
             inputHolder.setNoteField(loyaltyCard.note);
         } else {
             inputHolder.setNoteField(null);
         }
 
-        if (mShowBalance && !loyaltyCard.balance.equals(new BigDecimal("0"))) {
+        if (mLoyaltyCardListDisplayOptions.showingBalance() && !loyaltyCard.balance.equals(new BigDecimal("0"))) {
             inputHolder.setExtraField(inputHolder.mBalanceField, Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType), null, showDivider);
         } else {
             inputHolder.setExtraField(inputHolder.mBalanceField, null, null, false);
         }
 
-        if (mShowValidity && loyaltyCard.validFrom != null) {
+        if (mLoyaltyCardListDisplayOptions.showingValidity() && loyaltyCard.validFrom != null) {
             inputHolder.setExtraField(inputHolder.mValidFromField, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.validFrom), Utils.isNotYetValid(loyaltyCard.validFrom) ? Color.RED : null, showDivider);
         } else {
             inputHolder.setExtraField(inputHolder.mValidFromField, null, null, false);
         }
 
-        if (mShowValidity && loyaltyCard.expiry != null) {
+        if (mLoyaltyCardListDisplayOptions.showingValidity() && loyaltyCard.expiry != null) {
             inputHolder.setExtraField(inputHolder.mExpiryField, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry), Utils.hasExpired(loyaltyCard.expiry) ? Color.RED : null, showDivider);
         } else {
             inputHolder.setExtraField(inputHolder.mExpiryField, null, null, false);

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

@@ -261,7 +261,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                 + ", updateLoyaltyCard=" + updateLoyaltyCard);
     }
 
-
     @Override
     public void onSaveInstanceState(@NonNull Bundle savedInstanceState) {
         super.onSaveInstanceState(savedInstanceState);
@@ -365,8 +364,15 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         storeFieldEdit.addTextChangedListener(new SimpleTextWatcher() {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-                updateTempState(LoyaltyCardField.store, s.toString());
-                generateIcon(s.toString());
+                String storeName = s.toString().trim();
+                updateTempState(LoyaltyCardField.store, storeName);
+                generateIcon(storeName);
+
+                if (storeName.length() == 0) {
+                    storeFieldEdit.setError(getString(R.string.field_must_not_be_empty));
+                } else {
+                    storeFieldEdit.setError(null);
+                }
             }
         });
 
@@ -398,6 +404,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
 
         balanceField.setOnFocusChangeListener((v, hasFocus) -> {
             if (!hasFocus && !onResuming && !onRestoring) {
+                if (balanceField.getText().toString().isEmpty()) {
+                    updateTempState(LoyaltyCardField.balance, BigDecimal.valueOf(0));
+                }
+
                 balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(tempLoyaltyCard.balance, tempLoyaltyCard.balanceType));
             }
         });
@@ -409,10 +419,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                 try {
                     BigDecimal balance = Utils.parseBalance(s.toString(), tempLoyaltyCard.balanceType);
                     updateTempState(LoyaltyCardField.balance, balance);
+                    balanceField.setError(null);
                     validBalance = true;
                 } catch (ParseException e) {
-                    validBalance = false;
                     e.printStackTrace();
+                    balanceField.setError(getString(R.string.balanceParsingFailed));
+                    validBalance = false;
                 }
             }
         });
@@ -488,6 +500,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 updateTempState(LoyaltyCardField.cardId, s.toString());
+
+                if (s.length() == 0) {
+                    cardIdFieldView.setError(getString(R.string.field_must_not_be_empty));
+                } else {
+                    cardIdFieldView.setError(null);
+                }
             }
         });
 
@@ -933,7 +951,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         saveButton.setOnClickListener(v -> doSave());
         saveButton.bringToFront();
 
-        generateIcon(storeFieldEdit.getText().toString());
+        generateIcon(storeFieldEdit.getText().toString().trim());
 
         // It can't be null because we set it in updateTempState but SpotBugs insists it can be
         // NP_NULL_ON_SOME_PATH: Possible null pointer dereference and
@@ -1352,7 +1370,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         thumbnailEditIcon.setBackgroundColor(Utils.needsDarkForeground(color) ? Color.BLACK : Color.WHITE);
         thumbnailEditIcon.setColorFilter(Utils.needsDarkForeground(color) ? Color.WHITE : Color.BLACK);
 
-        generateIcon(storeFieldEdit.getText().toString());
+        generateIcon(storeFieldEdit.getText().toString().trim());
     }
 
     // ColorPickerDialogListener callback
@@ -1471,18 +1489,41 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
             return;
         }
 
+        boolean hasError = false;
+
         if (tempLoyaltyCard.store.isEmpty()) {
-            Snackbar.make(storeFieldEdit, R.string.noStoreError, Snackbar.LENGTH_LONG).show();
-            return;
+            storeFieldEdit.setError(getString(R.string.field_must_not_be_empty));
+
+            // Focus element
+            tabs.selectTab(tabs.getTabAt(0));
+            storeFieldEdit.requestFocus();
+
+            hasError = true;
         }
 
         if (tempLoyaltyCard.cardId.isEmpty()) {
-            Snackbar.make(cardIdFieldView, R.string.noCardIdError, Snackbar.LENGTH_LONG).show();
-            return;
+            cardIdFieldView.setError(getString(R.string.field_must_not_be_empty));
+
+            // Focus element if first error element
+            if (!hasError) {
+                tabs.selectTab(tabs.getTabAt(0));
+                cardIdFieldView.requestFocus();
+                hasError = true;
+            }
         }
 
         if (!validBalance) {
-            Snackbar.make(balanceField, getString(R.string.parsingBalanceFailed, balanceField.getText().toString()), Snackbar.LENGTH_LONG).show();
+            balanceField.setError(getString(R.string.balanceParsingFailed));
+
+            // Focus element if first error element
+            if (!hasError) {
+                tabs.selectTab(tabs.getTabAt(1));
+                balanceField.requestFocus();
+                hasError = true;
+            }
+        }
+
+        if (hasError) {
             return;
         }
 
@@ -1618,7 +1659,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         String cardIdString = tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : tempLoyaltyCard.cardId;
         CatimaBarcode barcodeFormat = tempLoyaltyCard.barcodeType;
 
-        if (cardIdString == null || barcodeFormat == null) {
+        if (cardIdString == null || cardIdString.isEmpty() || barcodeFormat == null) {
             barcodeImageLayout.setVisibility(View.GONE);
             return;
         }

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

@@ -0,0 +1,176 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+public class LoyaltyCardListDisplayOptionsManager {
+    public static class LoyaltyCardDisplayOption {
+        public String name;
+        public boolean value;
+        public Consumer<Boolean> callback;
+
+        LoyaltyCardDisplayOption(String name, boolean value, Consumer<Boolean> callback) {
+            this.name = name;
+            this.value = value;
+            this.callback = callback;
+        }
+    }
+
+    public final Context mContext;
+
+    private final Runnable mRefreshCardsCallback;
+    private final Runnable mSwapCursorCallback;
+
+    protected SharedPreferences mCardDetailsPref;
+
+    private boolean mShowNameBelowThumbnail;
+    private boolean mShowNote;
+    private boolean mShowBalance;
+    private boolean mShowValidity;
+    private boolean mShowArchivedCards;
+
+    public LoyaltyCardListDisplayOptionsManager(Context context, @NonNull Runnable refreshCardsCallback, @Nullable Runnable swapCursorCallback) {
+        mContext = context;
+        mRefreshCardsCallback = refreshCardsCallback;
+        mSwapCursorCallback = swapCursorCallback;
+
+        // Retrieve user details preference
+        mCardDetailsPref = mContext.getSharedPreferences(
+                mContext.getString(R.string.sharedpreference_card_details),
+                Context.MODE_PRIVATE);
+        mShowNameBelowThumbnail = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_name_below_thumbnail), false);
+        mShowNote = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_note), true);
+        mShowBalance = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_balance), true);
+        mShowValidity = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_validity), true);
+        mShowArchivedCards = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_archived_cards), true);
+    }
+
+    void saveDetailState(int stateId, boolean value) {
+        SharedPreferences.Editor cardDetailsPrefEditor = mCardDetailsPref.edit();
+        cardDetailsPrefEditor.putBoolean(mContext.getString(stateId), value);
+        cardDetailsPrefEditor.apply();
+    }
+
+    public void showNameBelowThumbnail(boolean show) {
+        mShowNameBelowThumbnail = show;
+        mRefreshCardsCallback.run();
+
+        saveDetailState(R.string.sharedpreference_card_details_show_name_below_thumbnail, show);
+    }
+
+    public boolean showingNameBelowThumbnail() {
+        return mShowNameBelowThumbnail;
+    }
+
+    public void showNote(boolean show) {
+        mShowNote = show;
+        mRefreshCardsCallback.run();
+
+        saveDetailState(R.string.sharedpreference_card_details_show_note, show);
+    }
+
+    public boolean showingNote() {
+        return mShowNote;
+    }
+
+    public void showBalance(boolean show) {
+        mShowBalance = show;
+        mRefreshCardsCallback.run();
+
+        saveDetailState(R.string.sharedpreference_card_details_show_balance, show);
+    }
+
+    public boolean showingBalance() {
+        return mShowBalance;
+    }
+
+    public void showValidity(boolean show) {
+        mShowValidity = show;
+        mRefreshCardsCallback.run();
+
+        saveDetailState(R.string.sharedpreference_card_details_show_validity, show);
+    }
+
+    public boolean showingValidity() {
+        return mShowValidity;
+    }
+
+    public void showArchivedCards(boolean show) {
+        if (mSwapCursorCallback == null) {
+            throw new IllegalStateException("No swap cursor callback is available, can not manage archive state");
+        }
+
+        mShowArchivedCards = show;
+        mSwapCursorCallback.run();
+
+        saveDetailState(R.string.sharedpreference_card_details_show_archived_cards, show);
+    }
+
+    public boolean showingArchivedCards() {
+        if (mSwapCursorCallback == null) {
+            throw new IllegalStateException("No swap cursor callback is available, can not manage archive state");
+        }
+
+        return mShowArchivedCards;
+    }
+
+    public void showDisplayOptionsDialog() {
+        List<LoyaltyCardDisplayOption> displayOptions = new ArrayList<>();
+
+        displayOptions.add(new LoyaltyCardDisplayOption(
+                mContext.getString(R.string.show_name_below_image_thumbnail),
+                showingNameBelowThumbnail(),
+                this::showNameBelowThumbnail
+        ));
+        displayOptions.add(new LoyaltyCardDisplayOption(
+                mContext.getString(R.string.show_note),
+                showingNote(),
+                this::showNote
+        ));
+        displayOptions.add(new LoyaltyCardDisplayOption(
+                mContext.getString(R.string.show_balance),
+                showingBalance(),
+                this::showBalance
+        ));
+        displayOptions.add(new LoyaltyCardDisplayOption(
+                mContext.getString(R.string.show_validity),
+                showingValidity(),
+                this::showValidity
+        ));
+
+        // Hide "Show archived cards" option unless the callback exists
+        if (mSwapCursorCallback != null) {
+            displayOptions.add(new LoyaltyCardDisplayOption(
+                    mContext.getString(R.string.show_archived_cards),
+                    showingArchivedCards(),
+                    this::showArchivedCards
+            ));
+        }
+
+        // We need to convert Boolean[] to boolean[]
+        boolean[] values = new boolean[displayOptions.size()];
+        for (int i = 0; i < values.length; i++) values[i] = displayOptions.get(i).value;
+
+        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(mContext);
+        builder.setTitle(R.string.action_display_options);
+        builder.setMultiChoiceItems(
+                displayOptions.stream().map(x -> x.name).toArray(String[]::new),
+                values,
+                (dialogInterface, i, b) -> displayOptions.get(i).callback.accept(b)
+        );
+        builder.setPositiveButton(R.string.ok, (dialog, i) -> dialog.dismiss());
+
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+}

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

@@ -98,7 +98,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     ImageView barcodeRenderTarget;
     int mainImageIndex = 0;
     List<ImageType> imageTypes;
-    boolean isBarcodeSupported = true;
 
     static final String STATE_IMAGEINDEX = "imageIndex";
     static final String STATE_FULLSCREEN = "isFullscreen";
@@ -293,7 +292,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             bundle.putBoolean(LoyaltyCardEditActivity.BUNDLE_UPDATE, true);
             intent.putExtras(bundle);
             startActivity(intent);
-            finish();
         });
         binding.fabEdit.bringToFront();
 
@@ -551,13 +549,18 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
         Log.i(TAG, "To view card: " + loyaltyCardId);
 
-        // The brightness value is on a scale from [0, ..., 1], where
-        // '1' is the brightest. We attempt to maximize the brightness
-        // to help barcode readers scan the barcode.
         Window window = getWindow();
         if (window != null) {
+            // Hide the keyboard if still shown (could be the case when returning from edit activity
+            window.setSoftInputMode(
+                    WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN
+            );
+
             WindowManager.LayoutParams attributes = window.getAttributes();
 
+            // The brightness value is on a scale from [0, ..., 1], where
+            // '1' is the brightest. We attempt to maximize the brightness
+            // to help barcode readers scan the barcode.
             if (settings.useMaxBrightnessDisplayingBarcode()) {
                 attributes.screenBrightness = 1F;
             }
@@ -639,12 +642,15 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         fixBottomAppBarImageButtonColor(binding.bottomAppBarUpdateBalanceButton);
         setBottomAppBarButtonState();
 
+        boolean isBarcodeSupported;
         if (format != null && !format.isSupported()) {
             isBarcodeSupported = false;
 
             Toast.makeText(this, getString(R.string.unsupportedBarcodeType), Toast.LENGTH_LONG).show();
         } else if (format == null) {
             isBarcodeSupported = false;
+        } else {
+            isBarcodeSupported = true;
         }
 
         imageTypes = new ArrayList<>();

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

@@ -41,7 +41,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import protect.card_locker.databinding.ArchiveActivityBinding;
 import protect.card_locker.databinding.ContentMainBinding;
 import protect.card_locker.databinding.MainActivityBinding;
 import protect.card_locker.databinding.SortingOptionBinding;
@@ -49,7 +48,6 @@ import protect.card_locker.preferences.SettingsActivity;
 
 public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
     private MainActivityBinding binding;
-    private ArchiveActivityBinding archiveActivityBinding;
     private ContentMainBinding contentMainBinding;
     private static final String TAG = "Catima";
     public static final String RESTART_ACTIVITY_INTENT = "restart_activity_intent";
@@ -72,8 +70,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     private View mNoGroupCardsText;
     private TabLayout groupsTabLayout;
 
-    private boolean mArchiveMode;
-    public static final String BUNDLE_ARCHIVE_MODE = "archiveMode";
+    private Runnable mSwapLoyaltyCardListCursor;
 
     private ActivityResultLauncher<Intent> mBarcodeScannerLauncher;
     private ActivityResultLauncher<Intent> mSettingsLauncher;
@@ -229,28 +226,25 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         extractIntentFields(getIntent());
         SplashScreen.installSplashScreen(this);
         super.onCreate(inputSavedInstanceState);
-        if (!mArchiveMode) {
-            binding = MainActivityBinding.inflate(getLayoutInflater());
-            setTitle(R.string.app_name);
-            setContentView(binding.getRoot());
-            setSupportActionBar(binding.toolbar);
-            groupsTabLayout = binding.groups;
-            contentMainBinding = ContentMainBinding.bind(binding.include.getRoot());
-        } else {
-            archiveActivityBinding = ArchiveActivityBinding.inflate(getLayoutInflater());
-            setTitle(R.string.archiveList);
-            setContentView(archiveActivityBinding.getRoot());
-            setSupportActionBar(archiveActivityBinding.toolbar);
-            groupsTabLayout = archiveActivityBinding.groups;
-            contentMainBinding = ContentMainBinding.bind(archiveActivityBinding.include.getRoot());
-        }
 
-        if(mArchiveMode) {
-            enableToolbarBackButton();
-        }
+        binding = MainActivityBinding.inflate(getLayoutInflater());
+        setTitle(R.string.app_name);
+        setContentView(binding.getRoot());
+        setSupportActionBar(binding.toolbar);
+        groupsTabLayout = binding.groups;
+        contentMainBinding = ContentMainBinding.bind(binding.include.getRoot());
 
         mDatabase = new DBHelper(this).getWritableDatabase();
 
+        mSwapLoyaltyCardListCursor = () -> {
+            Group group = null;
+            if (mGroup != null) {
+                group = (Group) mGroup;
+            }
+
+            mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection, mAdapter.showingArchivedCards() ? DBHelper.LoyaltyCardArchiveFilter.All : DBHelper.LoyaltyCardArchiveFilter.Unarchived));
+        };
+
         groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
@@ -283,7 +277,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         mNoGroupCardsText = contentMainBinding.noGroupCardsText;
         mCardList = contentMainBinding.list;
 
-        mAdapter = new LoyaltyCardCursorAdapter(this, null, this);
+        mAdapter = new LoyaltyCardCursorAdapter(this, null, this, mSwapLoyaltyCardListCursor);
         mCardList.setAdapter(mAdapter);
         registerForContextMenu(mCardList);
 
@@ -349,8 +343,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     protected void onResume() {
         super.onResume();
 
-        mAdapter.refreshState();
-
         if (mCurrentActionMode != null) {
             mAdapter.clearSelections();
             mCurrentActionMode.finish();
@@ -398,27 +390,25 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             groupsTabLayout.selectTab(tab);
             assert tab != null;
             mGroup = tab.getTag();
-        } else if (!mArchiveMode) {
+        } else {
             scaleScreen();
         }
 
         updateLoyaltyCardList(true);
         // End of active tab logic
 
-        if (!mArchiveMode) {
-            FloatingActionButton addButton = binding.fabAdd;
+        FloatingActionButton addButton = binding.fabAdd;
 
-            addButton.setOnClickListener(v -> {
-                Intent intent = new Intent(getApplicationContext(), ScanActivity.class);
-                Bundle bundle = new Bundle();
-                if (selectedTab != 0) {
-                    bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, groupsTabLayout.getTabAt(selectedTab).getText().toString());
-                }
-                intent.putExtras(bundle);
-                mBarcodeScannerLauncher.launch(intent);
-            });
-            addButton.bringToFront();
-        }
+        addButton.setOnClickListener(v -> {
+            Intent intent = new Intent(getApplicationContext(), ScanActivity.class);
+            Bundle bundle = new Bundle();
+            if (selectedTab != 0) {
+                bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, groupsTabLayout.getTabAt(selectedTab).getText().toString());
+            }
+            intent.putExtras(bundle);
+            mBarcodeScannerLauncher.launch(intent);
+        });
+        addButton.bringToFront();
     }
 
     @Override
@@ -432,7 +422,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     }
 
     private void displayCardSetupOptions(Menu menu, boolean shouldShow) {
-        for (int id : new int[]{R.id.action_search, R.id.action_shown_details, R.id.action_sort}) {
+        for (int id : new int[]{R.id.action_search, R.id.action_display_options, R.id.action_sort}) {
             menu.findItem(id).setVisible(shouldShow);
         }
     }
@@ -442,12 +432,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     }
 
     private void updateLoyaltyCardList(boolean updateCount) {
-        Group group = null;
-        if (mGroup != null) {
-            group = (Group) mGroup;
-        }
-
-        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection, mArchiveMode ? DBHelper.LoyaltyCardArchiveFilter.Archived : DBHelper.LoyaltyCardArchiveFilter.Unarchived));
+        mSwapLoyaltyCardListCursor.run();
 
         if (updateCount) {
             updateLoyaltyCardCount();
@@ -478,12 +463,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 }
             }
         } else {
-            if (mArchiveMode) {
-                // If an user deletes the last card in archive mode, we should close the activity
-                // This will move us back to the main view
-                finish();
-            }
-
             mCardList.setVisibility(View.GONE);
             mHelpSection.setVisibility(View.VISIBLE);
 
@@ -557,8 +536,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     }
 
     private void extractIntentFields(Intent intent) {
-        final Bundle b = intent.getExtras();
-        mArchiveMode = b != null && b.getBoolean(BUNDLE_ARCHIVE_MODE, false);
         onSharedIntent(intent);
     }
 
@@ -591,11 +568,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
     @Override
     public boolean onCreateOptionsMenu(Menu inputMenu) {
-        if (!mArchiveMode) {
-            getMenuInflater().inflate(R.menu.main_menu, inputMenu);
-        } else {
-            getMenuInflater().inflate(R.menu.archive_menu, inputMenu);
-        }
+        getMenuInflater().inflate(R.menu.main_menu, inputMenu);
 
         displayCardSetupOptions(inputMenu, mLoyaltyCardCount > 0);
 
@@ -630,14 +603,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             });
         }
 
-        if (!mArchiveMode) {
-            if (DBHelper.getArchivedCardsCount(mDatabase) == 0) {
-                inputMenu.findItem(R.id.action_archived).setVisible(false);
-            } else {
-                inputMenu.findItem(R.id.action_archived).setVisible(true);
-            }
-        }
-
         return super.onCreateOptionsMenu(inputMenu);
     }
 
@@ -649,8 +614,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             onBackPressed();
         }
 
-        if (id == R.id.action_shown_details) {
-            mAdapter.showSelectDetailDisplayDialog();
+        if (id == R.id.action_display_options) {
+            mAdapter.showDisplayOptionsDialog();
             invalidateOptionsMenu();
 
             return true;
@@ -706,15 +671,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             return true;
         }
 
-        if (id == R.id.action_archived) {
-            Intent i = new Intent(getApplicationContext(), MainActivity.class);
-            Bundle bundle = new Bundle();
-            bundle.putBoolean("archiveMode", true);
-            i.putExtras(bundle);
-            startActivity(i);
-            return true;
-        }
-
         if (id == R.id.action_import_export) {
             Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
             startActivity(i);
@@ -794,30 +750,31 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
             boolean hasStarred = false;
             boolean hasUnstarred = false;
-
-            if (!mArchiveMode) {
-                unarchiveItem.setVisible(false);
-                archiveItem.setVisible(true);
-            } else {
-                unarchiveItem.setVisible(true);
-                archiveItem.setVisible(false);
-            }
+            boolean hasArchived = false;
+            boolean hasUnarchived = false;
 
             for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-
                 if (loyaltyCard.starStatus == 1) {
                     hasStarred = true;
                 } else {
                     hasUnstarred = true;
                 }
 
-                if (hasStarred && hasUnstarred) {
-                    hasStarred = true;
-                    hasUnstarred = true;
+                if (loyaltyCard.archiveStatus == 1) {
+                    hasArchived = true;
+                } else {
+                    hasUnarchived = true;
+                }
+
+                // We have all types, no need to keep checking
+                if (hasStarred && hasUnstarred && hasArchived && hasUnarchived) {
                     break;
                 }
             }
 
+            unarchiveItem.setVisible(hasArchived);
+            archiveItem.setVisible(hasUnarchived);
+
             if (count == 1) {
                 starItem.setVisible(!hasStarred);
                 unstarItem.setVisible(!hasUnstarred);

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

@@ -28,7 +28,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import protect.card_locker.databinding.ActivityManageGroupBinding;
 
 public class ManageGroupActivity extends CatimaAppCompatActivity implements ManageGroupCursorAdapter.CardAdapterListener {
-
     private ActivityManageGroupBinding binding;
     private SQLiteDatabase mDatabase;
     private ManageGroupCursorAdapter mAdapter;
@@ -100,7 +99,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
         }
         mGroupNameText.setText(mGroup._id);
         setTitle(getString(R.string.editGroup, mGroup._id));
-        mAdapter = new ManageGroupCursorAdapter(this, null, this, mGroup);
+        mAdapter = new ManageGroupCursorAdapter(this, null, this, mGroup, null);
         mCardList.setAdapter(mAdapter);
         registerForContextMenu(mCardList);
 
@@ -167,8 +166,8 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
     public boolean onOptionsItemSelected(MenuItem inputItem) {
         int id = inputItem.getItemId();
 
-        if (id == R.id.action_shown_details) {
-            mAdapter.showSelectDetailDisplayDialog();
+        if (id == R.id.action_display_options) {
+            mAdapter.showDisplayOptionsDialog();
             invalidateOptionsMenu();
 
             return true;

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

@@ -16,8 +16,8 @@ public class ManageGroupCursorAdapter extends LoyaltyCardCursorAdapter {
     final private Group mGroup;
     final private SQLiteDatabase mDatabase;
 
-    public ManageGroupCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener, Group group) {
-        super(inputContext, inputCursor, inputListener);
+    public ManageGroupCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener, Group group, Runnable inputSwapCursorCallback) {
+        super(inputContext, inputCursor, inputListener, inputSwapCursorCallback);
         mGroup = new Group(group._id, group.order);
         mInGroupOverlay = new HashMap<>();
         mDatabase = new DBHelper(inputContext).getWritableDatabase();

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

@@ -11,16 +11,14 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.EditText;
-import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import java.util.List;
 
-import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.DefaultItemAnimator;
@@ -112,41 +110,16 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
         return super.onOptionsItemSelected(item);
     }
 
-    private void setGroupNameError(EditText input) {
-        String string = sanitizeAddGroupNameField(input.getText());
-
-        if (string.length() == 0) {
-            input.setError(getString(R.string.group_name_is_empty));
-            return;
-        }
-
-        if (DBHelper.getGroup(mDatabase, string) != null) {
-            input.setError(getString(R.string.group_name_already_in_use));
-            return;
-        }
-
-        input.setError(null);
-    }
-
-    private String sanitizeAddGroupNameField(CharSequence s) {
-        return s.toString().trim();
-    }
-
     private void createGroup() {
         AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
-        builder.setTitle(R.string.enter_group_name);
-        final EditText input = new EditText(this);
-        input.setInputType(InputType.TYPE_CLASS_TEXT);
-        input.addTextChangedListener(new SimpleTextWatcher() {
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                setGroupNameError(input);
-            }
-        });
-        setGroupNameError(input);
 
-        // Add spacing to EditText
-        FrameLayout container = new FrameLayout(this);
-        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
+        // Header
+        builder.setTitle(R.string.enter_group_name);
+
+        // Layout
+        LinearLayout layout = new LinearLayout(this);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT
         );
@@ -154,25 +127,51 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
         params.leftMargin = contentPadding;
         params.topMargin = contentPadding / 2;
         params.rightMargin = contentPadding;
+
+        // EditText with spacing
+        final EditText input = new EditText(this);
+        input.setInputType(InputType.TYPE_CLASS_TEXT);
         input.setLayoutParams(params);
-        container.addView(input);
+        layout.addView(input);
 
-        builder.setView(container);
+        // Set layout
+        builder.setView(layout);
 
+        // Buttons
         builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
-            CharSequence error = input.getError();
-
-            if (error != null) {
-                Toast.makeText(getApplicationContext(), error.toString(), Toast.LENGTH_SHORT).show();
-                return;
-            }
-
-            DBHelper.insertGroup(mDatabase, sanitizeAddGroupNameField(input.getText()));
+            DBHelper.insertGroup(mDatabase, input.getText().toString().trim());
             updateGroupList();
         });
         builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
         AlertDialog dialog = builder.create();
+
+        // Now that the dialog exists, we can bind something that affects the OK button
+        input.addTextChangedListener(new SimpleTextWatcher() {
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                String groupName = s.toString().trim();
+
+                if (groupName.length() == 0) {
+                    input.setError(getString(R.string.group_name_is_empty));
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                    return;
+                }
+
+                if (DBHelper.getGroup(mDatabase, groupName) != null) {
+                    input.setError(getString(R.string.group_name_already_in_use));
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                    return;
+                }
+
+                input.setError(null);
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+            }
+        });
+
         dialog.show();
+
+        // Disable button (must be done **after** dialog is shown to prevent crash
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+        // Set focus on input field
         dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
         input.requestFocus();
     }

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

@@ -1,5 +1,8 @@
 package protect.card_locker;
 
+import static protect.card_locker.BarcodeSelectorActivity.BARCODE_CONTENTS;
+import static protect.card_locker.BarcodeSelectorActivity.BARCODE_FORMAT;
+
 import android.Manifest;
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
@@ -9,6 +12,7 @@ import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.text.InputType;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
@@ -16,15 +20,22 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.activity.result.ActivityResultLauncher;
 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;
 import com.google.zxing.ResultPoint;
 import com.google.zxing.client.android.Intents;
 import com.journeyapps.barcodescanner.BarcodeCallback;
@@ -44,7 +55,6 @@ import protect.card_locker.databinding.ScanActivityBinding;
  * originally licensed under Apache 2.0
  */
 public class ScanActivity extends CatimaAppCompatActivity {
-
     private ScanActivityBinding binding;
     private CustomBarcodeScannerBinding customBarcodeScannerBinding;
     private static final String TAG = "Catima";
@@ -65,6 +75,9 @@ public class ScanActivity extends CatimaAppCompatActivity {
     // can't use the pre-made contract because that launches the file manager for image type instead of gallery
     private ActivityResultLauncher<Intent> photoPickerLauncher;
 
+    static final String STATE_SCANNER_ACTIVE = "scannerActive";
+    private boolean mScannerActive = true;
+
     private void extractIntentFields(Intent intent) {
         final Bundle b = intent.getExtras();
         cardId = b != null ? b.getString(LoyaltyCardEditActivity.BUNDLE_CARDID) : null;
@@ -87,8 +100,36 @@ 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()));
-        customBarcodeScannerBinding.addFromImage.setOnClickListener(this::addFromImage);
-        customBarcodeScannerBinding.addManually.setOnClickListener(this::addManually);
+        customBarcodeScannerBinding.fabOtherOptions.setOnClickListener(view -> {
+            setScannerActive(false);
+
+            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ScanActivity.this);
+            builder.setTitle(getString(R.string.add_a_card_in_a_different_way));
+            builder.setItems(
+                    new CharSequence[]{
+                            getString(R.string.addWithoutBarcode),
+                            getString(R.string.addManually),
+                            getString(R.string.addFromImage)
+                    },
+                    (dialogInterface, i) -> {
+                        switch (i) {
+                            case 0:
+                                addWithoutBarcode();
+                                break;
+                            case 1:
+                                addManually();
+                                break;
+                            case 2:
+                                addFromImage();
+                                break;
+                            default:
+                                throw new IllegalArgumentException("Unknown 'Add a card in a different way' dialog option");
+                        }
+                    }
+            );
+            builder.setOnCancelListener(dialogInterface -> setScannerActive(true));
+            builder.show();
+        });
 
         barcodeScannerView = binding.zxingBarcodeScanner;
 
@@ -106,8 +147,8 @@ public class ScanActivity extends CatimaAppCompatActivity {
             public void barcodeResult(BarcodeResult result) {
                 Intent scanResult = new Intent();
                 Bundle scanResultBundle = new Bundle();
-                scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, result.getText());
-                scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, result.getBarcodeFormat().name());
+                scanResultBundle.putString(BARCODE_CONTENTS, result.getText());
+                scanResultBundle.putString(BARCODE_FORMAT, result.getBarcodeFormat().name());
                 if (addGroup != null) {
                     scanResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
                 }
@@ -126,7 +167,11 @@ public class ScanActivity extends CatimaAppCompatActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        capture.onResume();
+
+        if (mScannerActive) {
+            capture.onResume();
+        }
+
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
             showCameraPermissionMissingText(false);
         }
@@ -146,9 +191,18 @@ public class ScanActivity extends CatimaAppCompatActivity {
     }
 
     @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        capture.onSaveInstanceState(outState);
+    protected void onSaveInstanceState(Bundle savedInstanceState) {
+        super.onSaveInstanceState(savedInstanceState);
+        capture.onSaveInstanceState(savedInstanceState);
+
+        savedInstanceState.putBoolean(STATE_SCANNER_ACTIVE, mScannerActive);
+    }
+
+    @Override
+    public void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+
+        mScannerActive = savedInstanceState.getBoolean(STATE_SCANNER_ACTIVE);
     }
 
     @Override
@@ -190,19 +244,20 @@ public class ScanActivity extends CatimaAppCompatActivity {
         return super.onOptionsItemSelected(item);
     }
 
-    private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
-        super.onActivityResult(requestCode, resultCode, intent);
-
-        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
-
-        if (barcodeValues.isEmpty()) {
-            return;
+    private void setScannerActive(boolean isActive) {
+        if (isActive) {
+            barcodeScannerView.resume();
+        } else {
+            barcodeScannerView.pause();
         }
+        mScannerActive = isActive;
+    }
 
+    private void returnResult(String barcodeContents, String barcodeFormat) {
         Intent manualResult = new Intent();
         Bundle manualResultBundle = new Bundle();
-        manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, barcodeValues.content());
-        manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, barcodeValues.format());
+        manualResultBundle.putString(BARCODE_CONTENTS, barcodeContents);
+        manualResultBundle.putString(BARCODE_FORMAT, barcodeFormat);
         if (addGroup != null) {
             manualResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
         }
@@ -211,7 +266,84 @@ public class ScanActivity extends CatimaAppCompatActivity {
         finish();
     }
 
-    public void addManually(View view) {
+    private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+
+        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
+
+        if (barcodeValues.isEmpty()) {
+            setScannerActive(true);
+            return;
+        }
+
+        returnResult(barcodeValues.content(), barcodeValues.format());
+    }
+
+    private void addWithoutBarcode() {
+        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+
+        builder.setOnCancelListener(dialogInterface -> setScannerActive(true));
+
+        // Header
+        builder.setTitle(R.string.addWithoutBarcode);
+
+        // Layout
+        LinearLayout layout = new LinearLayout(this);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+        );
+        int contentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
+        params.leftMargin = contentPadding;
+        params.topMargin = contentPadding / 2;
+        params.rightMargin = contentPadding;
+
+        // Description
+        TextView currentTextview = new TextView(this);
+        currentTextview.setText(getString(R.string.enter_card_id));
+        currentTextview.setLayoutParams(params);
+        layout.addView(currentTextview);
+
+        // EditText with spacing
+        final EditText input = new EditText(this);
+        input.setInputType(InputType.TYPE_CLASS_TEXT);
+        input.setLayoutParams(params);
+        layout.addView(input);
+
+        // Set layout
+        builder.setView(layout);
+
+        // Buttons
+        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
+            returnResult(input.getText().toString(), "");
+        });
+        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
+        AlertDialog dialog = builder.create();
+
+        // Now that the dialog exists, we can bind something that affects the OK button
+        input.addTextChangedListener(new SimpleTextWatcher() {
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (s.length() == 0) {
+                    input.setError(getString(R.string.card_id_must_not_be_empty));
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                } else {
+                    input.setError(null);
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+                }
+            }
+        });
+
+        dialog.show();
+
+        // Disable button (must be done **after** dialog is shown to prevent crash
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+        // Set focus on input field
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        input.requestFocus();
+    }
+
+    public void addManually() {
         Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
         if (cardId != null) {
             final Bundle b = new Bundle();
@@ -221,7 +353,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
         manualAddLauncher.launch(i);
     }
 
-    public void addFromImage(View view) {
+    public void addFromImage() {
         PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_IMAGE);
     }
 
@@ -236,6 +368,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
         try {
             photoPickerLauncher.launch(chooserIntent);
         } catch (ActivityNotFoundException e) {
+            setScannerActive(true);
             Toast.makeText(getApplicationContext(), R.string.failedLaunchingPhotoPicker, Toast.LENGTH_LONG).show();
             Log.e(TAG, "No activity found to handle intent", e);
         }
@@ -288,6 +421,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
             if (granted) {
                 addFromImageAfterPermission();
             } else {
+                setScannerActive(true);
                 Toast.makeText(this, R.string.storageReadPermissionRequired, Toast.LENGTH_LONG).show();
             }
         }

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

@@ -1,5 +1,6 @@
 package protect.card_locker;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -13,20 +14,24 @@ import android.graphics.ImageDecoder;
 import android.graphics.Matrix;
 import android.net.Uri;
 import android.os.Build;
-import android.os.LocaleList;
 import android.provider.MediaStore;
+import android.text.Layout;
+import android.text.Spanned;
+import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.util.TypedValue;
-import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.RawRes;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.graphics.ColorUtils;
+import androidx.core.os.LocaleListCompat;
 import androidx.exifinterface.media.ExifInterface;
 import androidx.palette.graphics.Palette;
 
@@ -54,10 +59,12 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.NumberFormat;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Currency;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -474,17 +481,30 @@ public class Utils {
 
         Locale chosenLocale = settings.getLocale();
 
-        Resources res = context.getResources();
-        Configuration configuration = res.getConfiguration();
+        // New API is broken on Android 6 and lower when selecting locales with both language and country, so still keeping this
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+            Resources res = context.getResources();
+            Configuration configuration = res.getConfiguration();
             setLocalesSdkLessThan24(chosenLocale, configuration, res);
             return context;
         }
 
-        LocaleList localeList = chosenLocale != null ? new LocaleList(chosenLocale) : LocaleList.getDefault();
-        LocaleList.setDefault(localeList);
-        configuration.setLocales(localeList);
-        return context.createConfigurationContext(configuration);
+        /* Documentation at https://developer.android.com/reference/androidx/appcompat/app/AppCompatDelegate#setApplicationLocales(androidx.core.os.LocaleListCompat)
+        For API levels below that, the developer has two options:
+        - They can opt-in to automatic storage handled through the library...
+        - The second option is that they can choose to handle storage themselves.
+        In order to do so they must use this API to initialize locales during app-start up and provide their stored locales.
+        In this case, API should be called before Activity.onCreate() in the activity lifecycle, e.g. in attachBaseContext().
+        Note: Developers should gate this to API versions <33.
+
+        We are handling storage ourselves (courtesy of the in-app language picker), so we take the second approach.
+        So according to docs, we should have the API < 33 check.
+        */
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            AppCompatDelegate.setApplicationLocales(chosenLocale != null ? LocaleListCompat.create(chosenLocale) : LocaleListCompat.getEmptyLocaleList());
+        }
+
+        return context;
     }
 
     @SuppressWarnings("deprecation")
@@ -493,6 +513,55 @@ public class Utils {
         res.updateConfiguration(configuration, res.getDisplayMetrics());
     }
 
+    /**
+     * Android 13 settings seems to "force" the user to select country of locale, but many app-supported locales either only have language, not country
+     * or have a country the user doesn't want, which creates a mismatch between the app's supported locales and the system locale.
+     * <br>
+     * Example: The user chooses Espanol (Espana) in system settings, but the app only supports Espanol (Argentina) and the "plain" Espanol.
+     * <br>
+     * This method returns the app-supported locale that is most similar to the system one.
+     * @param appLocales Locales supported by the app
+     * @param sysLocale Per-app locale in system settings
+     * @return The app-supported locale that best matches the system per-app locale
+     */
+    @NonNull
+    public static Locale getBestMatchLocale(@NonNull List<Locale> appLocales, @NonNull Locale sysLocale) {
+        int highestMatchMagnitude = appLocales.stream()
+                .mapToInt(appLocale -> calculateMatchMagnitudeOfTwoLocales(appLocale, sysLocale))
+                .max()
+                .orElseThrow(() -> new IllegalArgumentException("appLocales is empty"));
+        for (int i = 0; i < appLocales.size(); i++) {
+            Locale appLocale = appLocales.get(i);
+            if (calculateMatchMagnitudeOfTwoLocales(appLocale, sysLocale) == highestMatchMagnitude) {
+                return appLocale;
+            }
+        }
+        throw new AssertionError("This is not possible; there must be a locale whose match magnitude == " + highestMatchMagnitude + " with " + sysLocale.toLanguageTag());
+    }
+
+    private static int calculateMatchMagnitudeOfTwoLocales(@NonNull Locale appLocale, @NonNull Locale sysLocale) {
+        List<String> appLocaleAdjusted = new ArrayList<>();
+        List<String> sysLocaleAdjusted = new ArrayList<>();
+        appLocaleAdjusted.add(appLocale.getLanguage());
+        sysLocaleAdjusted.add(sysLocale.getLanguage());
+        if (!appLocale.getCountry().isEmpty() && !sysLocale.getCountry().isEmpty()) {
+            appLocaleAdjusted.add(appLocale.getCountry());
+            sysLocaleAdjusted.add(sysLocale.getCountry());
+        }
+        if (!appLocale.getVariant().isEmpty() && !sysLocale.getVariant().isEmpty()) {
+            appLocaleAdjusted.add(appLocale.getVariant());
+            sysLocaleAdjusted.add(sysLocale.getVariant());
+        }
+        if (!appLocale.getScript().isEmpty() && !sysLocale.getScript().isEmpty()) {
+            appLocaleAdjusted.add(appLocale.getScript());
+            sysLocaleAdjusted.add(sysLocale.getScript());
+        }
+        if (appLocaleAdjusted.equals(sysLocaleAdjusted)) {
+            return appLocaleAdjusted.size();
+        }
+        return 0;
+    }
+
     static public long getUnixTime() {
         return System.currentTimeMillis() / 1000;
     }
@@ -624,7 +693,7 @@ public class Utils {
         while (true) {
             String nextLine = reader.readLine();
 
-            if (nextLine == null || nextLine.isEmpty()) {
+            if (nextLine == null) {
                 reader.close();
                 break;
             }
@@ -636,6 +705,28 @@ public class Utils {
         return result.toString();
     }
 
+    // Very crude Markdown to HTML conversion.
+    // Only supports what's currently being used in CHANGELOG.md and PRIVACY.md.
+    // May break easily.
+    public static String basicMDToHTML(final String input) {
+        return input
+                .replaceAll("(?m)^#\\s+(.*)", "<h1>$1</h1>")
+                .replaceAll("(?m)^##\\s+(.*)", "<h2>$1</h2>")
+                .replaceAll("\\[([^]]+)\\]\\((https?://[\\w@#%&+=:?/.-]+)\\)", "<a href=\"$2\">$1</a>")
+                .replaceAll("\\*\\*([^*]+)\\*\\*", "<b>$1</b>")
+                .replaceAll("(?m)^-\\s+(.*)", "<ul><li>&nbsp;$1</li></ul>")
+                .replace("</ul>\n<ul>", "");
+    }
+
+    // Very crude autolinking.
+    // Only supports what's currently being used in CHANGELOG.md and PRIVACY.md.
+    // May break easily.
+    public static String linkify(final String input) {
+        return input
+                .replaceAll("([\\w.-]+@[\\w-]+(\\.[\\w-]+)+)", "<a href=\"mailto:$1\">$1</a>")
+                .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) {
         if (icon != null) {
             Log.d("onResume", "setting icon image");
@@ -700,4 +791,27 @@ public class Utils {
         }
         return a.equals(b);
     }
+
+    @SuppressLint("ClickableViewAccessibility")
+    public static void makeTextViewLinksClickable(final TextView textView, final Spanned text) {
+        textView.setOnTouchListener((v, event) -> {
+            int action = event.getAction();
+            if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_DOWN) {
+                int x = (int) event.getX() - textView.getTotalPaddingLeft() + textView.getScrollX();
+                int y = (int) event.getY() - textView.getTotalPaddingTop() + textView.getScrollY();
+                Layout layout = textView.getLayout();
+                int line = layout.getLineForVertical(y);
+                int off = layout.getOffsetForHorizontal(line, x);
+                ClickableSpan[] links = text.getSpans(off, off, ClickableSpan.class);
+                if (links.length != 0) {
+                    ClickableSpan link = links[0];
+                    if (action == MotionEvent.ACTION_UP) {
+                        link.onClick(textView);
+                    }
+                    return true;
+                }
+            }
+            return false;
+        });
+    }
 }

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

@@ -7,19 +7,23 @@ import android.os.Build;
 import android.os.Bundle;
 import android.view.MenuItem;
 
-import com.google.android.material.color.DynamicColors;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.os.LocaleListCompat;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
+import com.google.android.material.color.DynamicColors;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 import protect.card_locker.CatimaAppCompatActivity;
 import protect.card_locker.MainActivity;
 import protect.card_locker.R;
@@ -144,8 +148,40 @@ public class SettingsActivity extends CatimaAppCompatActivity {
                 }
             }
             localePreference.setEntries(entries.toArray(new CharSequence[entryValues.length]));
+            // Make locale picker preference in sync with system settings
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                Locale sysLocale = AppCompatDelegate.getApplicationLocales().get(0);
+                if (sysLocale == null) {
+                    // Corresponds to "System"
+                    localePreference.setValue("");
+                } else {
+                    // Need to set preference's value to one of localePreference.getEntryValues() to match the locale.
+                    // Locale.toLanguageTag() theoretically should be one of the values in localePreference.getEntryValues()...
+                    // But it doesn't work for some locales. so trying something more heavyweight.
+
+                    // Obtain all locales supported by the app.
+                    List<Locale> appLocales = Arrays.stream(localePreference.getEntryValues())
+                            .map(Objects::toString)
+                            .map(Utils::stringToLocale)
+                            .collect(Collectors.toList());
+                    // Get the app locale that best matches the system one
+                    Locale bestMatchLocale = Utils.getBestMatchLocale(appLocales, sysLocale);
+                    // Get its index in supported locales
+                    int index = appLocales.indexOf(bestMatchLocale);
+                    // Set preference value to entry value at that index
+                    localePreference.setValue(localePreference.getEntryValues()[index].toString());
+                }
+            }
+
             localePreference.setOnPreferenceChangeListener((preference, newValue) -> {
-                refreshActivity(true);
+                // See corresponding comment in Utils.updateBaseContextLocale for Android 6- notes
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+                    refreshActivity(true);
+                    return true;
+                }
+                String newLocale = (String) newValue;
+                // If newLocale is empty, that means "System" was selected
+                AppCompatDelegate.setApplicationLocales(newLocale.isEmpty() ? LocaleListCompat.getEmptyLocaleList() : LocaleListCompat.create(Utils.stringToLocale(newLocale)));
                 return true;
             });
 

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

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:context="protect.card_locker.MainActivity">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            style="?attr/toolbarStyle" />
-
-        <com.google.android.material.tabs.TabLayout
-            android:id="@+id/groups"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:tabMode="scrollable"
-            android:visibility="gone"/>
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <include
-        android:id="@+id/include"
-        layout="@layout/content_main" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -34,7 +34,7 @@
             app:layout_constraintBottom_toTopOf="@+id/barcodeIdLayout"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            android:text="@string/enterBarcodeInstructions" />
+            android:text="@string/manually_enter_barcode_instructions" />
         <LinearLayout
             android:id="@+id/barcodeIdLayout"
             android:orientation="horizontal"
@@ -42,7 +42,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             app:layout_constraintTop_toBottomOf="@+id/explanationText"
-            app:layout_constraintBottom_toTopOf="@+id/noBarcode"
+            app:layout_constraintBottom_toTopOf="@+id/barcodes"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent">
             <TextView android:textSize="16.0sp"
@@ -65,21 +65,11 @@
                 android:minHeight="48dp"
                 tools:ignore="ContentDescription" />
         </LinearLayout>
-        <Button
-            android:id="@+id/noBarcode"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@+id/barcodeIdLayout"
-            app:layout_constraintBottom_toTopOf="@+id/barcodes"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            android:text="@string/barcodeNoBarcode"
-            android:enabled="false" />
         <ListView
             android:id="@+id/barcodes"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
-            app:layout_constraintTop_toBottomOf="@+id/noBarcode"
+            app:layout_constraintTop_toBottomOf="@+id/barcodeIdLayout"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

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

@@ -2,6 +2,15 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+        android:id="@+id/fabOtherOptions"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        app:icon="@drawable/ic_baseline_unfold_more_24"
+        android:text="@string/action_more_options"
+        android:layout_margin="16dp" />
+
     <com.journeyapps.barcodescanner.BarcodeView
         android:id="@+id/zxing_barcode_surface"
         android:layout_width="match_parent"
@@ -33,25 +42,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-
-        <Button
-            android:id="@+id/add_from_image"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/addFromImage"
-            app:layout_constraintBottom_toTopOf="@+id/add_manually"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/camera_permission_denied_layout"
-            app:layout_constraintVertical_bias="1.0" />
-
-        <Button
-            android:id="@+id/add_manually"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/addManually"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </merge>

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

@@ -1,24 +0,0 @@
-<menu 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"
-    tools:context="protect.card_locker.MainActivity">
-    <item
-        android:id="@+id/action_search"
-        android:title="@string/action_search"
-        android:icon="@drawable/ic_search_white"
-        app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:showAsAction="always|collapseActionView"
-        android:visible="false"/>
-    <item
-        android:id="@+id/action_shown_details"
-        android:title="@string/action_show_details"
-        android:icon="@drawable/baseline_visibility_24"
-        app:showAsAction="always"
-        android:visible="false"/>
-    <item
-        android:id="@+id/action_sort"
-        android:title="@string/sort"
-        android:icon="@drawable/ic_baseline_sort_24"
-        app:showAsAction="always"
-        android:visible="false"/>
-</menu>

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

@@ -1,8 +1,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/action_shown_details"
-        android:title="@string/action_show_details"
+        android:id="@+id/action_display_options"
+        android:title="@string/action_display_options"
         android:icon="@drawable/baseline_visibility_24"
         app:showAsAction="always"
         android:visible="true"/>

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

@@ -10,8 +10,8 @@
         app:showAsAction="always|collapseActionView"
         android:visible="false"/>
     <item
-        android:id="@+id/action_shown_details"
-        android:title="@string/action_show_details"
+        android:id="@+id/action_display_options"
+        android:title="@string/action_display_options"
         android:icon="@drawable/baseline_visibility_24"
         app:showAsAction="always"
         android:visible="false"/>
@@ -26,10 +26,6 @@
         android:icon="@drawable/ic_folder_white"
         android:title="@string/groups"
         app:showAsAction="never"/>
-    <item
-        android:id="@+id/action_archived"
-        android:title="@string/archiveList"
-        app:showAsAction="never"/>
     <item
         android:id="@+id/action_import_export"
         android:icon="@drawable/ic_import_export_white_24dp"

app/src/main/res/raw/.gitignore

@@ -0,0 +1,2 @@
+changelog.md
+privacy.md

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

@@ -5,10 +5,10 @@ Allan Nordhøy
 solokot
 Heimen Stoffels
 Oğuz Ersen
+FC (Fay) Stegerman
 Katharine Chui
-mondstern
 SlavekB
-FC Stegerman
+mondstern
 StoyanDimitrov
 IllusiveMan196
 Altonss
@@ -37,6 +37,7 @@ Alexander Ivanov
 arshbeerSingh
 Denis Shilin
 Freddo espresso
+Ziad OUALHADJ
 Silvério Santos
 Miha Frangež
 Eryk Michalak
@@ -57,11 +58,12 @@ enolp
 Evgeniy Khramov
 Jane Kong
 Jean Mareilles
+Jean-Luc Tibaux
 José Rebelo
 K. Herbert
 Lisa A.
 Mawuena M. KODZO A.
-Max
+rudy3
 Reza
 Still / Azaka
 String E. Fighter
@@ -91,7 +93,6 @@ Fede Pujol
 FineFindus
 francescbassas
 Jason Li
-Jean-Luc Tibaux
 Jesse Davids
 Kamborio
 Kis Dominik
@@ -102,7 +103,9 @@ Michalis
 Michał
 Milo Ivir
 Mohamed A. Salah
+Yatoku
 the7thNightmare
+Quang Trung
 Rishi Agarwal
 Rosdyana Kusuma
 Sabri Ünal
@@ -117,6 +120,7 @@ Tian Jiale
 Tong Liu
 Tymofii Lytvynenko
 Wanath
+Younes Bouhouche
 Runner
 ce i moa
 enescan201
@@ -138,32 +142,38 @@ Tom Sawyer
 tfuxu
 Ahmed Saleh
 Airat
-Alexander
+Tapwaterisokey
+Alexandra-Ioana Moroz
 sNiXx
 Angela Enogieru
 Animesh Chatterjee
 Artūras Kalenda
 Ashish Yadav
 Aya Elsaadany
+Aya
 Biren
 Booc Sylvan
 Brage Nesteby Reitan
 Cap Amr Karam
 Carlo Maria Cuoghi Barbagli
+ChaoticNeutralCzech
 ChengCheng
 CherryMonster222
 Colgrave
-Csaba
+djcand
 Mylou53
+Daniel Sych
 danieluhrinyi
 Daniele Tricoli
 Kasina Dheeraj
 Donno
+Reihan
 Erik Spjelkavik
 Flav
 Franciszek Stefan
 Gael Caraballo
 Giacomo Alessandroni
+Govind S Nair
 Grzegorz
 gneiss15
 Hamustra Scans
@@ -178,7 +188,9 @@ Kung-chih
 Karvjorm
 polar
 krkk
+Kristoffer Grundström
 Laura Ferraz 
+Lionel HANNEQUIN
 Lucas da Costa
 almir992
 Manan Jhaveri
@@ -194,10 +206,10 @@ Minecraft boom
 Mobashir Raihan
 Moi Toi
 DiCeYMaYo
-OPADILOP
 DivideEtImpera
 Nicolas
 Nosnahc
+osamaqw
 pa4k
 pbeckmann
 Peer Beckmann
@@ -205,15 +217,16 @@ vandman
 Piotr Strebski
 Piotr Zet
 Poorva Patidar
-Quang Trung
 Quang Nguyen
 Ratnesh
 Rohan Babbar 
 Ronak Upadhyay
 Rose Liverman
 SKULD
+Sabrina
 Salem Malus
 Samarth Asthan
+tatyhub
 Shailendra Maurya
 SilverFS
 Simone Dotto
@@ -233,21 +246,25 @@ Waldemar Stoczkowski
 Wiktor Kwapisiewicz
 Yevgeny M
 Yusril A
-Ziad OUALHADJ
 ahmed-awad26
 Avik Kundu
 ayuyydev
 diksha-2911
+essys
 gbonaspetti
 gittyboy-cell
 huang ivan
+lassr8
 liva
 lucafont2
 mtrmirez
+michaelpratana
 opsik
+pesta007
 polarhun
 pooyanazari
 psa-jforestier
+z369369
 sergio
 skauVictor
 080502
@@ -258,6 +275,7 @@ Truestorybaby
 tygyh
 unstartdev
 wmilan 17
+MeH762
 يوسف لطفي
 しいたけ
 元气

app/src/main/res/raw/license.html

@@ -0,0 +1,696 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>GNU General Public License v3.0 - GNU Project - Free Software Foundation (FSF)</title>
+ <link rel="alternate" type="application/rdf+xml"
+       href="http://www.gnu.org/licenses/gpl-3.0.rdf" /> 
+</head>
+<body>
+<h3 style="text-align: center;">GNU GENERAL PUBLIC LICENSE</h3>
+<p style="text-align: center;">Version 3, 29 June 2007</p>
+
+<p>Copyright &copy; 2007 Free Software Foundation, Inc.
+ &lt;<a href="https://fsf.org/">https://fsf.org/</a>&gt;</p><p>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.</p>
+
+<h4 id="preamble">Preamble</h4>
+
+<p>The GNU General Public License is a free, copyleft license for
+software and other kinds of works.</p>
+
+<p>The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.</p>
+
+<p>When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.</p>
+
+<p>To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.</p>
+
+<p>For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.</p>
+
+<p>Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.</p>
+
+<p>For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.</p>
+
+<p>Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.</p>
+
+<p>Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.</p>
+
+<p>The precise terms and conditions for copying, distribution and
+modification follow.</p>
+
+<h4 id="terms">TERMS AND CONDITIONS</h4>
+
+<h5 id="section0">0. Definitions.</h5>
+
+<p>&ldquo;This License&rdquo; refers to version 3 of the GNU General Public License.</p>
+
+<p>&ldquo;Copyright&rdquo; also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.</p>
+ 
+<p>&ldquo;The Program&rdquo; refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as &ldquo;you&rdquo;.  &ldquo;Licensees&rdquo; and
+&ldquo;recipients&rdquo; may be individuals or organizations.</p>
+
+<p>To &ldquo;modify&rdquo; a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a &ldquo;modified version&rdquo; of the
+earlier work or a work &ldquo;based on&rdquo; the earlier work.</p>
+
+<p>A &ldquo;covered work&rdquo; means either the unmodified Program or a work based
+on the Program.</p>
+
+<p>To &ldquo;propagate&rdquo; a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.</p>
+
+<p>To &ldquo;convey&rdquo; a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.</p>
+
+<p>An interactive user interface displays &ldquo;Appropriate Legal Notices&rdquo;
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.</p>
+
+<h5 id="section1">1. Source Code.</h5>
+
+<p>The &ldquo;source code&rdquo; for a work means the preferred form of the work
+for making modifications to it.  &ldquo;Object code&rdquo; means any non-source
+form of a work.</p>
+
+<p>A &ldquo;Standard Interface&rdquo; means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.</p>
+
+<p>The &ldquo;System Libraries&rdquo; of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+&ldquo;Major Component&rdquo;, in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.</p>
+
+<p>The &ldquo;Corresponding Source&rdquo; for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.</p>
+
+<p>The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.</p>
+
+<p>The Corresponding Source for a work in source code form is that
+same work.</p>
+
+<h5 id="section2">2. Basic Permissions.</h5>
+
+<p>All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.</p>
+
+<p>You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.</p>
+
+<p>Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.</p>
+
+<h5 id="section3">3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h5>
+
+<p>No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.</p>
+
+<p>When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.</p>
+
+<h5 id="section4">4. Conveying Verbatim Copies.</h5>
+
+<p>You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.</p>
+
+<p>You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.</p>
+
+<h5 id="section5">5. Conveying Modified Source Versions.</h5>
+
+<p>You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:</p>
+
+<ul>
+<li>a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.</li>
+
+<li>b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    &ldquo;keep intact all notices&rdquo;.</li>
+
+<li>c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.</li>
+
+<li>d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.</li>
+</ul>
+
+<p>A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+&ldquo;aggregate&rdquo; if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.</p>
+
+<h5 id="section6">6. Conveying Non-Source Forms.</h5>
+
+<p>You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:</p>
+
+<ul>
+<li>a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.</li>
+
+<li>b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.</li>
+
+<li>c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.</li>
+
+<li>d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.</li>
+
+<li>e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.</li>
+</ul>
+
+<p>A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.</p>
+
+<p>A &ldquo;User Product&rdquo; is either (1) a &ldquo;consumer product&rdquo;, which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, &ldquo;normally used&rdquo; refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.</p>
+
+<p>&ldquo;Installation Information&rdquo; for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.</p>
+
+<p>If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).</p>
+
+<p>The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.</p>
+
+<p>Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.</p>
+
+<h5 id="section7">7. Additional Terms.</h5>
+
+<p>&ldquo;Additional permissions&rdquo; are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.</p>
+
+<p>When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.</p>
+
+<p>Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:</p>
+
+<ul>
+<li>a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or</li>
+
+<li>b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or</li>
+
+<li>c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or</li>
+
+<li>d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or</li>
+
+<li>e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or</li>
+
+<li>f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.</li>
+</ul>
+
+<p>All other non-permissive additional terms are considered &ldquo;further
+restrictions&rdquo; within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.</p>
+
+<p>If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.</p>
+
+<p>Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.</p>
+
+<h5 id="section8">8. Termination.</h5>
+
+<p>You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).</p>
+
+<p>However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.</p>
+
+<p>Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.</p>
+
+<p>Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.</p>
+
+<h5 id="section9">9. Acceptance Not Required for Having Copies.</h5>
+
+<p>You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.</p>
+
+<h5 id="section10">10. Automatic Licensing of Downstream Recipients.</h5>
+
+<p>Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.</p>
+
+<p>An &ldquo;entity transaction&rdquo; is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.</p>
+
+<p>You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.</p>
+
+<h5 id="section11">11. Patents.</h5>
+
+<p>A &ldquo;contributor&rdquo; is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's &ldquo;contributor version&rdquo;.</p>
+
+<p>A contributor's &ldquo;essential patent claims&rdquo; are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, &ldquo;control&rdquo; includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.</p>
+
+<p>Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.</p>
+
+<p>In the following three paragraphs, a &ldquo;patent license&rdquo; is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To &ldquo;grant&rdquo; such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.</p>
+
+<p>If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  &ldquo;Knowingly relying&rdquo; means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.</p>
+  
+<p>If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.</p>
+
+<p>A patent license is &ldquo;discriminatory&rdquo; if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.</p>
+
+<p>Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.</p>
+
+<h5 id="section12">12. No Surrender of Others' Freedom.</h5>
+
+<p>If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.</p>
+
+<h5 id="section13">13. Use with the GNU Affero General Public License.</h5>
+
+<p>Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.</p>
+
+<h5 id="section14">14. Revised Versions of this License.</h5>
+
+<p>The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.</p>
+
+<p>Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License &ldquo;or any later version&rdquo; applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.</p>
+
+<p>If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.</p>
+
+<p>Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.</p>
+
+<h5 id="section15">15. Disclaimer of Warranty.</h5>
+
+<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &ldquo;AS IS&rdquo; WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p>
+
+<h5 id="section16">16. Limitation of Liability.</h5>
+
+<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.</p>
+
+<h5 id="section17">17. Interpretation of Sections 15 and 16.</h5>
+
+<p>If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.</p>
+
+<p>END OF TERMS AND CONDITIONS</p>
+
+<h4 id="howto">How to Apply These Terms to Your New Programs</h4>
+
+<p>If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.</p>
+
+<p>To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the &ldquo;copyright&rdquo; line and a pointer to where the full notice is found.</p>
+
+<pre>    &lt;one line to give the program's name and a brief idea of what it does.&gt;
+    Copyright (C) &lt;year&gt;  &lt;name of author&gt;
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see &lt;https://www.gnu.org/licenses/&gt;.
+</pre>
+
+<p>Also add information on how to contact you by electronic and paper mail.</p>
+
+<p>If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:</p>
+
+<pre>    &lt;program&gt;  Copyright (C) &lt;year&gt;  &lt;name of author&gt;
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+</pre>
+
+<p>The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an &ldquo;about box&rdquo;.</p>
+
+<p>You should also get your employer (if you work as a programmer) or school,
+if any, to sign a &ldquo;copyright disclaimer&rdquo; for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+&lt;<a href="https://www.gnu.org/licenses/">https://www.gnu.org/licenses/</a>&gt;.</p>
+
+<p>The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+&lt;<a href="https://www.gnu.org/licenses/why-not-lgpl.html">https://www.gnu.org/licenses/why-not-lgpl.html</a>&gt;.</p>
+
+</body></html>

app/src/main/res/raw/stocard_stores.csv

@@ -1336,6 +1336,7 @@ _id,name,barcodeFormat
 1d49dc17-6906-4123-bcd5-7ab8fa1a7778,Анстер,CODE_128
 1d737928-c513-44ce-992a-dc0c799daaf6,Zona Market,CODE_39
 1dae65a7-6e7e-48f9-ae4e-902bf48f166b,Aвоська,CODE_128
+1db293c9-5215-4940-8136-ffb9fb2d8de2,Hammer,CODE_128
 1e075692-0044-4acf-a7a5-06f235bcf126,Nature's Garden,CODE_128
 1e07e980-a5d7-4371-ac61-2d53b909d7de,Agorà,EAN_13
 1e341520-6791-40dc-984c-6c3ef58a3e60,Vegetarian Card,EAN_13
@@ -1806,6 +1807,7 @@ _id,name,barcodeFormat
 2377,大買家,CODE_128
 2378,达芙妮,CODE_128
 2379,達芙妮,CODE_128
+2379fc78-8a67-433b-ba7f-9359e33dbfd5,INV,CODE_128
 238,Niedermeyer,EAN_13
 2380,美廉社,CODE_128
 2381,美華泰,EAN_8
@@ -2130,6 +2132,7 @@ _id,name,barcodeFormat
 2647,老百姓大药房,CODE_128
 2648,豪客来,EAN_13
 2649,特力和乐,EAN_13
+264f0d93-6519-4931-bc67-a90906c83d6b,Omoda,CODE_128
 265,Polo,CODE_39
 2650,GXG,CODE_128
 2651,大洋,CODE_128
@@ -3213,6 +3216,7 @@ _id,name,barcodeFormat
 35,Beldona,EAN_13
 350,Vino Club,EAN_13
 3500,Eurospesa Ideashop,EAN_13
+3500fa7d-449a-469e-84d1-c0cc75f7fe09,Réno-Dépôt,CODE_128
 3501,Южный двор,EAN_13
 3502,Rewardtfc,CODE_128
 3503,Snappy,CODE_128
@@ -5389,6 +5393,7 @@ _id,name,barcodeFormat
 553,Mayoral,CODE_128
 55388f1f-e82f-409b-8b57-a5dde231749f,FDM,CODE_128
 554,Meliá,CODE_128
+554f77c9-9cfb-4edd-b378-a26f1608f7b9,trinkgut,CODE_128
 555,Neck & Neck,CODE_39
 556,Opticalia,CODE_128
 5569b4b1-dbd4-410e-8a2e-af7d9eeac7ad,ДОБРОСТРОЙ,EAN_13
@@ -5722,6 +5727,7 @@ _id,name,barcodeFormat
 6a122848-fe9d-4f5b-b5df-d3f1031c5583,Є книгарня,EAN_13
 6a4e2358-f0db-434c-9f92-d37c017ec4ad,ENAPO,CODE_128
 6a5ac3f8-04cb-4d14-884f-1231b72228e8,Топаз,EAN_13
+6a7b1bc8-eca7-4323-9080-68af9414254f,CastoPro,CODE_128
 6a85186a-bfd9-4078-a5da-db1b4e1fb526,Molders,CODE_128
 6aa89061-d0b5-46a2-9019-b1cb7146e485,Just Plastics,CODE_128
 6aa9bd9a-b099-4997-9fa1-b0a7525c6ec7,AZ Casa,EAN_13
@@ -6385,6 +6391,7 @@ _id,name,barcodeFormat
 948,Paolo Conte,EAN_13
 949,Finn Flare,EAN_8
 9495b8a0-ae5e-410c-82b4-f6a5f66d3bd2,SE.COM STORE,CODE_128
+94f48cf3-1b49-4abb-9514-8307adc46175,Little Italy Barber Shop,EAN_13
 95,emilio adani,ITF
 950,Олант,EAN_13
 951,Лента,CODE_128
@@ -6637,6 +6644,7 @@ abd65b02-5fc2-416d-880f-cbb2a47b768b,DV8,EAN_13
 abdef57c-a954-4860-9e3b-a7957f242c6b,Donetti,CODE_39
 ac16ecc3-51d5-417e-993f-43616ad516a7,Academies Studentenkaart,QR_CODE
 ac9b512b-1e30-4df0-b07e-1a8fd8875803,Conte,EAN_13
+acc75558-87c2-4115-b884-5a558a0f74eb,Hibiscus Coast Softball Club,QR_CODE
 acd80ee4-3556-4a9e-8847-2e4e7c6ce5b9,EU COVID-19 Certificat de Vaccination,QR_CODE
 ad3f7a9b-1227-434d-9735-6b3437229404,Holland Casino,QR_CODE
 ad413d8d-ca35-49b6-9da6-07f668df53be,Непоседа-сити,CODE_39
@@ -6876,6 +6884,7 @@ c649e96d-c14d-447a-8179-957c37783aea,Линия Здоровья,EAN_8
 c674e2c2-820f-48bb-b5ad-8c1d5fb2b70f,Jumbo & Score,EAN_13
 c7044929-a87e-4e59-a895-c1b5ad1b95ec,Konzum,CODE_39
 c70a4f85-ee42-4f12-b800-339c9e4304d6,Blooker,EAN_13
+c715e1a6-7335-421a-9c0a-e5aa7b4c7af5,The Radstock Co-operative Society,CODE_128
 c7486964-f07f-4419-ae4d-2abe5efa8347,Айкрафт,CODE_128
 c77229b5-5a87-40e1-842a-3752e7944486,Hill Street Grocer,CODE_128
 c78913ef-53b2-40f5-b356-2b293270be50,Yo-get-it,CODE_39
@@ -7273,6 +7282,7 @@ f297047b-8a48-4c3d-928d-cbbd8d0497d1,аптека ника,EAN_13
 f2a92584-5ef8-4220-b0ca-7aa48decd2e4,Artex Ieper,EAN_13
 f2b9fa76-c78f-4d2c-821f-70678bc8d4d5,Parfümerie Becker,EAN_8
 f2c8f722-9c5f-423d-9989-deca7901aa11,Poetry,CODE_128
+f2d3f68c-7b77-4464-91d2-3162e74bea48,Neinver,EAN_13
 f3189d64-dd39-468b-872d-3bb70e4d416c,The Watergardens Hotel ,CODE_128
 f3287ab2-0308-42f8-92dc-3147456a4a69,НУЖНО!,EAN_13
 f35a3882-27b2-417d-8093-e87f8f25509a,Первый Семейный,CODE_128

app/src/main/res/resources.properties

@@ -0,0 +1 @@
+unqualifiedResLocale=en-US

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

@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_search">بحث</string>
-    <string name="action_add">اضف</string>
-    <string name="noGiftCards">اضغط على + الزر الإضافي لاضافة بطاقة, او استورد من ⋮ القائمة.</string>
+    <string name="action_add">أضف</string>
+    <string name="noGiftCards">اضغط على + زر الإضافة لاضافة بطاقة، او استورد من ⋮ القائمة.</string>
     <string name="noMatchingGiftCards">لا نتائج. حاول تغيير كلمات البحث.</string>
     <string name="storeName">اسم</string>
     <string name="note">مذكرة</string>
-    <string name="cardId">بطاقة شخصية</string>
+    <string name="cardId">معرّف البطاقة</string>
     <string name="barcodeType">نوع الباركود</string>
-    <string name="barcodeNoBarcode">لا يوجد باركود</string>
     <string name="noBarcode">لا يوجد باركود</string>
-    <string name="star">اضف الي المفضلة</string>
+    <string name="star">أضف الي المفضلة</string>
     <string name="unstar">حذف من المفضلة</string>
     <string name="cancel">إلغاء</string>
     <string name="save">حفظ</string>
@@ -29,8 +28,6 @@
     <string name="noCardsMessage">اضف بطاقة أولا</string>
     <string name="card_ids_copied">البطاقة(ات) الشخصية المنسوخة</string>
     <string name="barcodeImageDescriptionWithType">صورة <xliff:g>%s</xliff:g> باركود</string>
-    <string name="noStoreError">لا يوجد اسم مدخل</string>
-    <string name="noCardIdError">لا يوجد بطاقة شخصية مدخلة</string>
     <string name="noCardExistsError">لا يمكن العثور على هذه البطاقة</string>
     <string name="failedParsingImportUriError">لا يمكن تحليل الرابط المستورد</string>
     <string name="importExport">استيراد/تصدير</string>
@@ -50,7 +47,6 @@
     <string name="app_license">البرمجيات الحرة متروكة الحقوق, ترخيص +GPLv3</string>
     <string name="app_libraries">مكتبات الطرف الثالث الحرة: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">اختار الباركود</string>
-    <string name="enterBarcodeInstructions">أدخل بطاقة هوية ، واختر نوع الباركود أدناه ، أو \"لا يوجد باركود\".</string>
     <string name="copy_to_clipboard_toast">تم نسخ بطاقة الهوية إلى الحافظة</string>
     <string name="thumbnailDescription">صورة مصغرة</string>
     <string name="starImage">نجم مفضل</string>
@@ -79,7 +75,6 @@
     <string name="balance">الرصيد</string>
     <string name="currency">العملة</string>
     <string name="points">نقاط</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> لا يبدو أنه رصيد صالح.</string>
     <string name="chooseImportType">استيراد البيانات من</string>
     <string name="app_loyalty_card_keychain">سلسلة مفاتيح بطاقة الولاء</string>
     <string name="privacy_policy">سياسة الخصوصية</string>
@@ -120,7 +115,7 @@
     <string name="turn_flashlight_off">أطفئ المصباح</string>
     <string name="settings_locale">لغة</string>
     <string name="settings_system_locale">النظام</string>
-    <string name="setIcon">تعيين رمز</string>
+    <string name="setIcon">تعيين الصورة المصغرة</string>
     <string name="settings_catima_theme">Catima</string>
     <string name="settings_pink_theme">زهري</string>
     <string name="settings_magenta_theme">أرجواني</string>
@@ -150,9 +145,8 @@
     <string name="unarchive">أخرج من الأرشيف</string>
     <string name="archived">تمت أرشفة البطاقة</string>
     <string name="unarchived">البطاقة غير مؤرشفة</string>
-    <string name="archiveList">أرشيف</string>
     <string name="failedLaunchingPhotoPicker">تعذر العثور على تطبيق معرض مدعوم</string>
-    <string name="noGiftCardsGroup">انشئ بعض من البطاقات, و عيينهم لهذه المجموعة.</string>
+    <string name="noGiftCardsGroup">انشئ بعضا من البطاقات, ثم عيينهم لهذه المجموعة.</string>
     <string name="deleteTitle">مسح بطاقة</string>
     <plurals name="selectedCardCount">
         <item quantity="zero"><xliff:g>%d</xliff:g> محدد</item>
@@ -171,7 +165,6 @@
     <string name="license">رخصة</string>
     <string name="sort_by_name">اسم</string>
     <string name="version_history">تاريخ النسخة</string>
-    <string name="action_hide_details">أخف التفاصيل</string>
     <plurals name="groupCardCountWithArchived">
         <item quantity="zero"><xliff:g>%1$d</xliff:g> بطاقة ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
         <item quantity="one"><xliff:g>%1$d</xliff:g> بطاقة ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
@@ -245,9 +238,7 @@
     <string name="on_github">على GitHub</string>
     <string name="report_error">الإبلاغ عن خطأ</string>
     <string name="sort_by_expiry">انقضاء</string>
-    <string name="noUnarchivedCardsMessage">لا توجد بطاقات غير مؤرشفة موجودة</string>
     <string name="importLoyaltyCardKeychain">الاستيراد من Loyalty Card Keychain</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="importLoyaltyCardKeychainMessage">حدد ملفك <i>LoyaltyCardKeychain.csv</i> التصدير من Loyalty Card Keychain للاستيراد.
 \nقم بإنشائه من قائمة الاستيراد / التصدير في Loyalty Card Keychain بالضغط على تصدير هناك أولاً.</string>
     <string name="importStocard">الاستيراد من Stocard</string>
@@ -256,7 +247,6 @@
 \nلا يتم جمع أي بيانات على الإطلاق ، والتي يمكن لأي شخص تأكيدها لأن تطبيقنا هو برنامج حر.</string>
     <string name="failedGeneratingShareURL">تعذر إنشاء عنوان URL قابل للمشاركة. الرجاء الإبلاغ عن هذا.</string>
     <string name="help_translate_this_app">ساعد في ترجمة هذا التطبيق</string>
-    <string name="action_show_details">اظهر التفاصيل</string>
     <string name="on_google_play">على Google Play</string>
     <string name="settings_theme_color">لون المظهر</string>
     <string name="previousCard">السابق</string>
@@ -291,4 +281,29 @@
     <string name="permissionReadCardsDescription">اقرأ بطاقتك مع جميع التفاصيل، بما فيه الملاحضات والصور</string>
     <string name="settings_display_barcode_max_brightness_summary">ظروري لعمل بعض الماسحات الضوئية</string>
     <string name="permissionReadCardsLabel">اقرأ بطاقات كاتيما</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">حقوق النشر © 2019–<xliff:g>%d</xliff:g> Sylvia van Os والمساهمون</string>
+    <string name="app_copyright_short">حقوق النشر © Sylvia van Os والمساهمون</string>
+    <string name="openFrontImageInGalleryApp">افتح الصورة الأمامية في تطبيق المعرض</string>
+    <string name="show_name_below_image_thumbnail">إظهار الاسم أسفل الصورة المصغرة</string>
+    <string name="show_validity">إظهار الصلاحية</string>
+    <string name="view_online">مشاهدة حية</string>
+    <string name="settings_category_title_general">عام</string>
+    <string name="switchToBarcode">التبديل إلى الباركود</string>
+    <string name="settings_disable_lockscreen_while_viewing_card_summary">تعطيل قفل الشاشة أثناء عرض البطاقة</string>
+    <string name="action_display_options">خيارات العرض</string>
+    <string name="settings_oled_dark_summary">يقلل من استخدام البطارية على شاشات OLED</string>
+    <string name="icon_header_click_text">اضغط لفترة طويلة لتحرير الصورة المصغرة</string>
+    <string name="settings_category_title_cards">البطاقات</string>
+    <string name="show_note">إظهار الملاحظة</string>
+    <string name="switchToBackImage">التبديل إلى الصورة الخلفية</string>
+    <string name="switchToFrontImage">التبديل إلى الصورة الأمامية</string>
+    <string name="settings_allow_content_provider_read_summary">سيظل يتعين على التطبيقات طلب الإذن لمنحها حق الوصول</string>
+    <string name="setBarcodeHeight">ضبط ارتفاع الباركود</string>
+    <string name="openBackImageInGalleryApp">فتح الصورة الخلفية في تطبيق المعرض</string>
+    <string name="settings_allow_content_provider_read_title">السماح للتطبيقات الأخرى بالوصول إلى بياناتي</string>
+    <string name="donate">يتبرع</string>
+    <string name="show_archived_cards">عرض البطاقات المؤرشفة</string>
+    <string name="settings_category_title_privacy">خصوصية</string>
+    <string name="show_balance">إظهار التوازن</string>
+    <string name="settings_keep_screen_on_summary">تعطيل مهلة الشاشة أثناء عرض البطاقة</string>
 </resources>

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

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

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

@@ -9,7 +9,6 @@
     <string name="confirm">Confirmar</string>
     <string name="deleteConfirmation">¿Quies desaniciar esta tarxeta permanentemente\?</string>
     <string name="importExport">Importar/Esportar</string>
-    <string name="noCardIdError">Nun s\'introduxo nenguna ID</string>
     <string name="exportFailed">Num se pudo facer la esportación</string>
     <string name="importFailedTitle">La importación falló</string>
     <string name="exportOptionExplanation">Los datos escríbense nel llugar qu\'escueyas.</string>
@@ -22,7 +21,6 @@
     </plurals>
     <string name="noGiftCards">Calca\'l botón «+» p\'amestar una tarxeta o impórtales dende\'l menú «⋮».</string>
     <string name="cardId">ID</string>
-    <string name="barcodeNoBarcode">Nun hai nengún códigu de barres</string>
     <string name="save">Guardar</string>
     <string name="edit">Editar</string>
     <string name="delete">Desaniciar</string>
@@ -35,7 +33,6 @@
     <string name="importFailed">Nun se pudo facer la importación</string>
     <string name="noCardExistsError">Nun se pudo atopar esa tarxeta</string>
     <string name="all">Too</string>
-    <string name="noStoreError">Nun s\'introduxo nengún nome</string>
     <string name="sendLabel">Unviar…</string>
     <string name="editCardTitle">Editar la tarxeta</string>
     <string name="ok">D\'acuerdu</string>
@@ -47,7 +44,6 @@
     <string name="storageReadPermissionRequired">Esta aición precisa\'l permisu pa lleer l\'almacenamientu…</string>
     <string name="cameraPermissionRequired">Esta aición precisa l\'accesu a la cámara…</string>
     <string name="cameraPermissionDeniedTitle">Nun se pudo acceder a la cámara</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="app_copyright_old">Básase en Loyalty Card Keychain
 \ncopyright © 2016–2020 Branden Archer</string>
     <string name="thumbnailDescription">Miniatura</string>

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

@@ -11,7 +11,6 @@
     <string name="unstar">Премахва от любими</string>
     <string name="star">Добавя към любими</string>
     <string name="noBarcode">Липсва щрихкод</string>
-    <string name="barcodeNoBarcode">Липсва щрихкод</string>
     <string name="barcodeType">Вид на щрихкода</string>
     <string name="cardId">Номер на карта</string>
     <string name="note">Бележка</string>
@@ -27,7 +26,6 @@
     <string name="app_license">Свободен софтуер с авторски права, лицензиран под GPLv3+</string>
     <string name="frontImageDescription">Снимка на предната страна</string>
     <string name="backImageDescription">Снимка на задната страна</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> не изглежда истинска наличност.</string>
     <string name="no">Не</string>
     <string name="yes">Да</string>
     <string name="setBackImage">Снимка на задната страна</string>
@@ -37,7 +35,6 @@
     <string name="noCardExistsError">Картата не е намерена</string>
     <string name="updateBarcodeQuestionText">Номерът е променен. Желаете ли същата стойност да бъде приложена и към щрихкода\?</string>
     <string name="updateBarcodeQuestionTitle">Обновяване на щрихкода\?</string>
-    <string name="noCardIdError">Не е въведен номер</string>
     <string name="noCardsMessage">Добавете карта</string>
     <string name="cardShortcut">Пряк път до карта</string>
     <string name="addCardTitle">Добавяне на карта</string>
@@ -79,7 +76,6 @@
     <string name="expiryStateSentenceExpired">Изтекла: <xliff:g>%s</xliff:g></string>
     <string name="balanceSentence">Наличност: <xliff:g>%s</xliff:g></string>
     <string name="noGroups">Докоснете бутона +, за да добавите списък.</string>
-    <string name="noStoreError">Не е въведено наименование</string>
     <string name="groups">Списъци</string>
     <string name="enter_group_name">Въведете име на списъка</string>
     <string name="intent_import_card_from_url_share_text">Искам да споделя тази карта с вас</string>
@@ -94,7 +90,6 @@
     <string name="starImage">Звезда за любимо</string>
     <string name="thumbnailDescription">Миниатюра</string>
     <string name="copy_to_clipboard_toast">Номерът е копиран в междинната памет</string>
-    <string name="enterBarcodeInstructions">Въведете номер и после или изберете вида на щрихкода, или докоснете бутона „Липсва щрихкод“.</string>
     <string name="selectBarcodeTitle">Избиране на щрихкод</string>
     <string name="importOptionApplicationButton">Избиране чрез приложение</string>
     <string name="importing">Внасяне…</string>
@@ -125,9 +120,9 @@
     <string name="app_libraries">Свободни библиотеки: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="debug_version_fmt">Издание: <xliff:g id="version">%s</xliff:g></string>
     <string name="about_title_fmt">Относно <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="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> Силвия ван Ос и сътрудници</string>
     <string name="app_copyright_old">На основата на Loyalty Card Keychain
-\nвсички права запазени © 2016–2020 Branden Archer</string>
+\nвсички права запазени © 2016–2020 Бранден Арчър</string>
     <string name="about">Относно</string>
     <string name="importOptionFilesystemTitle">Внасяне от файловата система</string>
     <string name="importCatima">Внасяне от Catima</string>
@@ -203,8 +198,6 @@
     <string name="selectColor">Избиране на цвят</string>
     <string name="group_name_is_empty">Името на списъка не може да е празно</string>
     <string name="group_edit">Редактиране на списък</string>
-    <string name="action_show_details">Подробности под картата</string>
-    <string name="action_hide_details">По-малко детайли</string>
     <string name="noGiftCardsGroup">Създайте карти и ги зачислите към списък от тук.</string>
     <string name="translate_platform">в Weblate</string>
     <string name="shortcutSelectCard">Избор на карта</string>
@@ -228,8 +221,6 @@
     <string name="unarchive">Изваждане от архива</string>
     <string name="archived">Картата е архивирана</string>
     <string name="unarchived">Карта е извадена от архива</string>
-    <string name="archiveList">Архив</string>
-    <string name="noUnarchivedCardsMessage">Няма карти извън архива</string>
     <string name="failedLaunchingPhotoPicker">Не е намерено поддържано приложение за галерия</string>
     <plurals name="groupCardCountWithArchived">
         <item quantity="one"><xliff:g>%1$d</xliff:g> карта (<xliff:g id="archivedCount">%2$d</xliff:g> архивирана)</item>
@@ -273,7 +264,7 @@
     <string name="show_validity">Валидност</string>
     <string name="show_name_below_image_thumbnail">Наименование</string>
     <string name="permissionReadCardsLabel">Четене на карти на Catima</string>
-    <string name="permissionReadCardsDescription">Четене на картите с всички подробности, включително бележки и изображения</string>
+    <string name="permissionReadCardsDescription">четене на картите на Catima с всички подробности, включително бележки и изображения</string>
     <string name="settings_allow_content_provider_read_title">Разрешаване на достъп на други приложения до данните</string>
     <string name="settings_display_barcode_max_brightness_summary">Необходимо за работата на някои скенери</string>
     <string name="settings_disable_lockscreen_while_viewing_card_summary">Без заключване на екрана при преглед на карта</string>
@@ -283,4 +274,8 @@
     <string name="settings_category_title_general">Общи</string>
     <string name="settings_category_title_privacy">Поверителност</string>
     <string name="settings_keep_screen_on_summary">Спира автоматичното заключване на екрана при преглед на карти</string>
+    <string name="action_display_options">Настройки на списъка</string>
+    <string name="show_archived_cards">Архивирани карти</string>
+    <string name="view_online">Преглед</string>
+    <string name="app_copyright_short">Всички права запазени © Силвия ван Ос и сътрудници</string>
 </resources>

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

@@ -4,7 +4,6 @@
     <string name="cancel">বাতিল</string>
     <string name="unstar">তারা মুক্ত</string>
     <string name="star">তারা</string>
-    <string name="barcodeNoBarcode">কোনো বারকোড নেই</string>
     <string name="barcodeType">বারকোড ধরন</string>
     <string name="note">বিঃদ্রঃ</string>
     <string name="storeName">দোকানের নাম</string>
@@ -69,7 +68,6 @@
     <string name="reverse">...উল্টো ক্রমে</string>
     <string name="sort_by">ক্রমানুসার</string>
     <string name="noCardExistsError">কার্ডটি খুঁজে পাওয়া গেল না</string>
-    <string name="noStoreError">স্টোরেজ ত্রুটি নেই</string>
     <string name="card_ids_copied">আইডি কপি করা হয়েছে</string>
     <string name="noCardsMessage">কোন কার্ড বার্তা নেই</string>
     <string name="addCardTitle">কার্ডের শিরোনাম যোগ করুন</string>
@@ -100,7 +98,6 @@
     <string name="importOptionApplicationExplanation">একটি ফাইল খোলার জন্য যেকোনো অ্যাপ বা আপনার প্রিয় ফাইল ম্যানেজারটি ব্যবহার করুন।</string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">মেধাস্বত্ব © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="app_license">কপিলেফট দ্বারা রক্ষা করা মুক্ত সফটওয়্যার, লাইসেন্স করা GPLv3+ এর অধীনে</string>
-    <string name="enterBarcodeInstructions">আইডিটি লিখুন আর নয় নিচ থেকে একটি বারকোডের প্রকার বা \"কোনো বারকোড নেই\", নির্বাচন করুন।</string>
     <plurals name="deleteCardsConfirmation">
         <item quantity="one">এই <xliff:g>%d</xliff:g>টি কার্ড কি চিরকালের জন্য মুছে দেবো\?</item>
         <item quantity="other">এই <xliff:g>%d</xliff:g>টি কার্ড কি চিরকালের জন্য মুছে দেবো\?</item>
@@ -129,7 +126,6 @@
     <string name="cardShortcut">কার্ড শর্টকাট</string>
     <string name="exportFailed">রপ্তানি করা যাচ্ছে না</string>
     <string name="copy_to_clipboard_toast">আইডি ক্লিপবোর্ডে নকল করা হল</string>
-    <string name="noCardIdError">কোনো আইডি দওয়া হয়নি</string>
     <string name="importExportHelp">নিজের ডেটা অন্য কোথাও সংরক্ষণ করে রাখলে পরে সেটা অন্য ডিভাইসে সরিয়ে নিতে পারবেন।</string>
     <string name="importFailed">আমদানি করা গেল না</string>
     <string name="noGiftCardsGroup">কিছু কার্ড বানান আর এই গ্রুপে স্থির করুন।</string>
@@ -186,7 +182,6 @@
 \nকোন তথ্য একেবারেই সংগ্রহ করা হয় না, যা যে কেউ নিশ্চিত করতে পারবেন কারন আমাদের অ্যাপ মুক্ত সফটওয়্যার।</string>
     <string name="balance">ব্যালান্স</string>
     <string name="points">পয়েন্ট</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> কোনো বৈধ ব্যালান্স মনে হচ্ছে না।</string>
     <string name="chooseImportType">এখান থেকে তথ্য আমদানি করুন</string>
     <string name="app_loyalty_card_keychain">আনুগত্য কার্ড কীচেন</string>
     <string name="privacy_policy">ব্যক্তিগত তথ্যের গোপনীয়তা নীতি</string>
@@ -197,7 +192,6 @@
 \nলয়্যালটি কার্ড কীচেনের আমদানি/রপ্তানি মেনু থেকে প্রথমে সেখানে রপ্তানি টিপে এটি তৈরি করুন।</string>
     <string name="selectColor">রঙ নির্বাচন করুন</string>
     <string name="unarchived">কার্ড সংরক্ষণাগারমুক্ত করা হয়েছে</string>
-    <string name="archiveList">সংরক্ষণাগার</string>
     <string name="report_error">ভুল প্রতিবেদন</string>
     <string name="failedLaunchingPhotoPicker">একটি সমর্থিত গ্যালারি অ্যাপ খুঁজে পাওয়া যায়নি</string>
     <plurals name="groupCardCountWithArchived">
@@ -234,8 +228,6 @@
     <string name="barcodeLongPressMessage">গ্যালারি অ্যাপে শুধুমাত্র ছবি খোলা যাবে</string>
     <string name="translate_platform">Weblate-এ</string>
     <string name="on_google_play">Google Play-তে</string>
-    <string name="action_show_details">বিস্তারিত দেখাও</string>
-    <string name="action_hide_details">আড়াল বিস্তারিত</string>
     <string name="shortcutSelectCard">একটি কার্ড নির্বাচন করুন</string>
     <string name="options">অপশন</string>
     <string name="starred">তারকাচিহ্নিত</string>
@@ -254,7 +246,6 @@
     <string name="archive">সংরক্ষণ করুন</string>
     <string name="unarchive">সংরক্ষণাগারমুক্ত করুন</string>
     <string name="archived">কার্ড সংরক্ষণাগারভুক্ত</string>
-    <string name="noUnarchivedCardsMessage">আর্কাইভ করা কোনো কার্ড নেই</string>
     <string name="welcome">Catima-তে স্বাগতম</string>
     <string name="updateBalanceTitle">আপনি কত খরচ করেছেন\?</string>
     <string name="updateBalanceHint">পরিমান লিখুন</string>

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

@@ -29,7 +29,6 @@
     <string name="storeName">নাম</string>
     <string name="note">বিঃদ্রঃ</string>
     <string name="star">ফেভারিটে যোগ করুন</string>
-    <string name="barcodeNoBarcode">কোন বারকোড নেই</string>
     <string name="noBarcode">বারকোড নেই</string>
     <string name="unstar">পছন্দের তালিকা থেকে অপসারণ</string>
     <string name="cancel">বাতিল করুন</string>

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

@@ -4,7 +4,6 @@
     <string name="cancel">Odustani</string>
     <string name="unstar">Ukloni sve omiljene</string>
     <string name="star">Omiljene</string>
-    <string name="barcodeNoBarcode">Ne postoji barkod</string>
     <string name="barcodeType">Barcode tip</string>
     <string name="note">Bilježnica</string>
     <string name="storeName">Ime</string>
@@ -69,7 +68,6 @@
     <string name="reverse">Rikverc</string>
     <string name="sort_by">Sortiraj</string>
     <string name="noCardExistsError">Nisam mogao pronaći tu karticu</string>
-    <string name="noStoreError">Nije uneseno ime</string>
     <string name="card_ids_copied">Kopiran ID/ovi</string>
     <string name="noCardsMessage">Dodaj prvo kartu</string>
     <string name="addCardTitle">Dodaj Kartu</string>
@@ -93,7 +91,6 @@
     <string name="exportFailedTitle">Izvoz neuspješan</string>
     <string name="scanCardBarcode">Skeniraj barkod</string>
     <string name="cardShortcut">Prečica kartice</string>
-    <string name="noCardIdError">ID nije unesen</string>
     <string name="failedParsingImportUriError">Nisam uspio parsirati URI za uvoz</string>
     <string name="importExport">Uvoz/Izvoz</string>
     <string name="exportName">Izvoz</string>

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

@@ -16,8 +16,6 @@
     <string name="editCardTitle">Editovat kartu</string>
     <string name="addCardTitle">Přidat kartu</string>
     <string name="scanCardBarcode">Naskenovat čárový kód</string>
-    <string name="noStoreError">Nezadáno žádné jméno</string>
-    <string name="noCardIdError">Nezadáno ID</string>
     <string name="importExport">Import/Export</string>
     <string name="exportName">Export</string>
     <string name="importExportHelp">Zálohování dat vám umožní přesunout je do jiného zařízení.</string>
@@ -61,7 +59,6 @@
     <string name="unstar">Odebrat z oblíbených</string>
     <string name="star">Přidat do oblíbených</string>
     <string name="noBarcode">Žádný čárový kód</string>
-    <string name="barcodeNoBarcode">Tato karta nemá čárový kód</string>
     <string name="barcodeType">Typ čárového kódu</string>
     <string name="noMatchingGiftCards">Nic nenalezeno. Zkuste zadat jiný výraz.</string>
     <string name="action_search">Hledat</string>
@@ -92,7 +89,6 @@
     <string name="expiryStateSentence">Platí do: <xliff:g>%s</xliff:g></string>
     <string name="moveDown">Přesunout dolů</string>
     <string name="moveUp">Přesunout nahoru</string>
-    <string name="enterBarcodeInstructions">Zadejte ID a níže vyberte typ čárového kódu nebo klikněte na „Tato karta nemá čárový kód“.</string>
     <string name="settings_brown_theme">Hnědá</string>
     <string name="settings_grey_theme">Šedá</string>
     <string name="settings_green_theme">Zelená</string>
@@ -149,7 +145,6 @@
     <string name="privacy_policy">Zásady soukromí</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="chooseImportType">Importovat data z</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> se nezdá být platným zůstatkem.</string>
     <string name="points">Body</string>
     <string name="currency">Měna</string>
     <string name="balance">Zůstatek</string>
@@ -174,7 +169,6 @@
     <string name="exportSuccessful">Data exportována</string>
     <string name="settings_display_barcode_max_brightness">Vysoký jas při zobrazení čárového kódu</string>
     <string name="starImage">Hvězdička u oblíbených</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <plurals name="selectedCardCount">
         <item quantity="one">Vybrána <xliff:g>%d</xliff:g> karta</item>
         <item quantity="few">Vybrány <xliff:g>%d</xliff:g> karty</item>
@@ -210,8 +204,6 @@
     <string name="editGroup">Úprava skupiny: <xliff:g>%s</xliff:g></string>
     <string name="noGiftCardsGroup">Zatím nemáte žádné věrnostní karty. Jakmile nějaké přidáte, můžete je zde přiřadit do skupiny.</string>
     <string name="shortcutSelectCard">Vybrat kartu</string>
-    <string name="action_show_details">Zobrazit detaily</string>
-    <string name="action_hide_details">Skrýt detaily</string>
     <string name="translate_platform">na Weblate</string>
     <string name="showMoreInfo">Zobrazit podrobnosti</string>
     <string name="starred">S hvězdičkou</string>
@@ -228,8 +220,6 @@
     <string name="settings_lock_on_opening_orientation">Ponechat orientaci jako při otevření karty</string>
     <string name="archive">Archivovat</string>
     <string name="unarchive">Vrátit z archivu</string>
-    <string name="archiveList">Archiv</string>
-    <string name="noUnarchivedCardsMessage">Nejsou žádné karty vrácené z archivu</string>
     <string name="unarchived">Karta vrácena z archivu</string>
     <string name="settings_card_orientation">Orientace čárového kódu</string>
     <string name="settings_landscape_orientation">Na šířku</string>
@@ -279,7 +269,7 @@
     <string name="show_note">Zobrazit poznámku</string>
     <string name="show_validity">Zobrazit platnost</string>
     <string name="show_balance">Zobrazit zůstatek</string>
-    <string name="permissionReadCardsDescription">Číst vaše karty a všechny jejich podrobnosti, včetně poznámek a obrázků</string>
+    <string name="permissionReadCardsDescription">číst vaše karty Catima a všechny jejich podrobnosti, včetně poznámek a obrázků</string>
     <string name="settings_allow_content_provider_read_summary">Aplikace budou i tak muset požádat o povolení k poskytnutí přístupu</string>
     <string name="permissionReadCardsLabel">Číst karty Catima</string>
     <string name="settings_allow_content_provider_read_title">Umožnit ostatním aplikacím přístup k mým datům</string>
@@ -290,4 +280,9 @@
     <string name="settings_disable_lockscreen_while_viewing_card_summary">Při prohlížení karty zabránit zamčení obrazovky</string>
     <string name="settings_category_title_cards">Karty</string>
     <string name="settings_category_title_general">Obecné</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os a přispěvatelé</string>
+    <string name="app_copyright_short">Copyright © Sylvia van Os a přispěvatelé</string>
+    <string name="action_display_options">Možnosti zobrazení</string>
+    <string name="show_archived_cards">Zobrazovat archivované karty</string>
+    <string name="view_online">Zobrazovat online</string>
 </resources>

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

@@ -21,7 +21,6 @@
     <string name="unstar">Fjern fra favoritter</string>
     <string name="star">Føj til favoritter</string>
     <string name="noBarcode">Ingen stregkode</string>
-    <string name="barcodeNoBarcode">Dette kort har ingen stregkode</string>
     <string name="barcodeType">Stregkode type</string>
     <string name="cardId">Kort ID</string>
     <string name="note">Bemærk</string>
@@ -52,7 +51,6 @@
     <string name="starImage">Favorit stjerne</string>
     <string name="thumbnailDescription">Miniaturebillede til kort</string>
     <string name="copy_to_clipboard_toast">Kort-ID kopieret til udklipsholderen</string>
-    <string name="enterBarcodeInstructions">Indtast kortets ID, og vælg enten kortets stregkodetype nedenfor, eller \"Dette kort har ingen stregkode\".</string>
     <string name="selectBarcodeTitle">Vælg stregkode</string>
     <string name="app_copyright_old">Baseret på Loyalty Card Keychain
 \ncopyright © 2016-2020 Branden Archer.</string>
@@ -68,8 +66,6 @@
     <string name="exportOptionExplanation">Dataene skrives til en placering efter eget valg.</string>
     <string name="failedParsingImportUriError">Kunne ikke analysere import-URI\'en</string>
     <string name="noCardExistsError">Kunne ikke finde kort</string>
-    <string name="noCardIdError">Der er ikke angivet noget kort-ID</string>
-    <string name="noStoreError">Intet navn angivet</string>
     <string name="deleteConfirmationGroup">Slet gruppe\?</string>
     <string name="all">Alle</string>
     <string name="noGroupCards">Denne gruppe indeholder ikke nogen kort</string>

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

@@ -22,8 +22,6 @@
     <string name="scanCardBarcode">Barcode scannen</string>
     <string name="cardShortcut">Shortcut zu einer Karte</string>
     <string name="noCardsMessage">Füge zuerst eine Karte hinzu</string>
-    <string name="noStoreError">Kein Name eingegeben</string>
-    <string name="noCardIdError">Keine ID eingegeben</string>
     <string name="noCardExistsError">Diese Karte konnte nicht gefunden werden</string>
     <string name="importExport">Import/Export</string>
     <string name="exportName">Export</string>
@@ -58,13 +56,11 @@
     <string name="settings_light_theme">Hell</string>
     <string name="settings_system_theme">System</string>
     <string name="settings_theme">Farbschema</string>
-    <string name="enterBarcodeInstructions">Gib die ID ein und wähle unten entweder einen Barcodetyp oder „Es gibt keinen Barcode“.</string>
     <string name="app_copyright_old">Basierend auf Loyalty Card Keychain
 \nCopyright © 2016-2020 Branden Archer</string>
     <string name="exportOptionExplanation">Die Daten werden an einen Ort deiner Wahl geschrieben.</string>
     <string name="failedParsingImportUriError">Die Import-URI konnte nicht verarbeitet werden</string>
     <string name="share">Teilen</string>
-    <string name="barcodeNoBarcode">Es gibt keinen Barcode</string>
     <string name="barcodeType">Barcodetyp</string>
     <string name="starImage">Favoritenstern</string>
     <string name="deleteConfirmationGroup">Gruppe löschen?</string>
@@ -87,7 +83,6 @@
     <string name="groupsList">Gruppen: <xliff:g>%s</xliff:g></string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="chooseImportType">Daten importieren aus</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> scheint kein gültiges Guthaben zu sein.</string>
     <string name="points">Punkte</string>
     <string name="currency">Währung</string>
     <string name="balance">Guthaben</string>
@@ -129,7 +124,6 @@
     <string name="wrongValueForBarcodeType">Der Wert ist für den gewählten Barcodetyp leider nicht gültig</string>
     <string name="app_resources">Freie Ressourcen von Drittanbietern: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Freie Bibliotheken von Drittanbietern: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="intent_import_card_from_url_share_multiple_text">Ich möchte diese Karten mit dir teilen</string>
     <string name="copy_to_clipboard_multiple_toast">Kartennummern in die Zwischenablage kopiert</string>
     <string name="card_ids_copied">ID(s) kopiert</string>
@@ -180,7 +174,7 @@
     <string name="app_contributors">Ermöglicht durch: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="barcodeImageDescriptionWithType">Bild <xliff:g>%s</xliff:g> Barcode</string>
     <string name="sort_by">Sortieren nach</string>
-    <string name="sort_by_expiry">Ablaufdatum</string>
+    <string name="sort_by_expiry">Ablauf</string>
     <string name="sort_by_most_recently_used">Zuletzt verwendet</string>
     <string name="sort_by_name">Name</string>
     <string name="sort">Sortieren</string>
@@ -205,8 +199,6 @@
     <string name="noGiftCardsGroup">Erstelle einige Karten und ordne sie dann hier der Gruppe zu.</string>
     <string name="setIcon">Vorschau setzen</string>
     <string name="selectColor">Farbe auswählen</string>
-    <string name="action_show_details">Details anzeigen</string>
-    <string name="action_hide_details">Details ausblenden</string>
     <string name="translate_platform">auf Weblate</string>
     <string name="shortcutSelectCard">Wählen Sie eine Karte</string>
     <string name="options">Optionen</string>
@@ -220,8 +212,6 @@
     <string name="include_if_asking_support">Wenn Sie Unterstützung anfordern möchten, geben Sie bitte die folgenden Informationen an:</string>
     <string name="settings_follow_system_orientation">System folgen</string>
     <string name="settings_landscape_orientation">Landschaft</string>
-    <string name="archiveList">Archiv</string>
-    <string name="noUnarchivedCardsMessage">Es gibt keine nicht archivierten Karten</string>
     <string name="settings_portrait_orientation">Porträt</string>
     <string name="duplicateCard">Duplizieren</string>
     <string name="unarchive">Archivierung aufheben</string>
@@ -283,4 +273,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="action_display_options">Anzeigeoptionen</string>
+    <string name="show_archived_cards">Zeige archivierte Karten</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>
 </resources>

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

@@ -18,8 +18,6 @@
     <string name="scanCardBarcode">Σαρώστε τον γραμμοκώδικα (bardcode)</string>
     <string name="cardShortcut">Συντόμευση Κάρτας</string>
     <string name="noCardsMessage">Προσθέστε μία κάρτα πρώτα</string>
-    <string name="noStoreError">Δεν έχει εισαχθεί όνομα</string>
-    <string name="noCardIdError">Δεν έχει εισαχθεί κωδικός</string>
     <string name="noCardExistsError">Δεν ήταν δυνατό να εντοπιστεί η κάρτα</string>
     <string name="importExport">Εισαγωγή/Εξαγωγή</string>
     <string name="exportName">Εξαγωγή</string>
@@ -58,7 +56,6 @@
         <item quantity="other"><xliff:g>%d</xliff:g> επιλέγχθηκαν</item>
     </plurals>
     <string name="noGiftCardsGroup">Δημιούργησε κάρτες και βάλτες σε αυτή την ομάδα.</string>
-    <string name="barcodeNoBarcode">Δεν υπάρχει barcode</string>
     <string name="addManually">Χειροκίνητη εισαγωγή κωδικού</string>
     <string name="never">Ποτέ</string>
     <string name="share">Κοινοποίηση</string>
@@ -105,7 +102,6 @@
     <string name="removeImage">Αφαίρεση εικόνας</string>
     <string name="takePhoto">Τραβήξτε μια φωτογραφία</string>
     <string name="updateBarcodeQuestionText">Αλλάξατε τον κωδικό. Θέλετε να ενημερώσετε και τον γραμμοκώδικα στην ίδια τιμή;</string>
-    <string name="action_show_details">Εμφάνιση λεπτομερειών</string>
     <string name="options">Επιλογές</string>
     <string name="noGroupCards">Αυτή η ομάδα είναι άδεια</string>
     <string name="settings_display_barcode_max_brightness">Επιπλέον φωτισμός γραμμοκώδικα</string>
@@ -119,7 +115,6 @@
     </plurals>
     <string name="card_ids_copied">Αντιγραμμένη/ες ταυτότητα/ες</string>
     <string name="errorReadingImage">Δεν ήταν δυνατό να διαβαστεί η εικόνα</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> δεν φαίνεται να είναι έγκυρο το υπόλοιπο.</string>
     <string name="currency">Νόμισμα</string>
     <string name="privacy_policy">Πολιτική απορρήτου</string>
     <string name="chooseImportType">Εισαγωγή δεδομένων από</string>
@@ -152,7 +147,6 @@
     <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="action_hide_details">Απόκρυψη λεπτομερειών</string>
     <string name="importSuccessful">Δεδομένα εισήχθησαν</string>
     <string name="moveUp">Προχώρα πάνω</string>
     <string name="barcodeType">Τύπος γραμμοκώδικα</string>
@@ -182,7 +176,6 @@
     </plurals>
     <string name="app_copyright_old">Βασισμένο στο Loyalty Card Keychain
 \nπνευματικά δικαιώματα © 2016-2020 Branden Archer</string>
-    <string name="enterBarcodeInstructions">Εισάγετε τον κωδικό και διαλέξτε έναν είδος γραμμοκώδικα από κάτω ή \"Δεν υπάρχει γραμμοκώδικας\".</string>
     <string name="settings_follow_system_orientation">Ακολούθηση συστήματος</string>
     <string name="settings_card_orientation">Προσανατολισμός γραμμοκώδικα</string>
     <string name="settings_portrait_orientation">Πορτραίτο</string>
@@ -233,8 +226,6 @@
     <string name="archived">Η κάρτα αρχειοθετήθηκε</string>
     <string name="unarchived">Η κάρτα αφαιρέθηκε από το αρχείο</string>
     <string name="unarchive">Αφαίρεση από το αρχείο</string>
-    <string name="archiveList">Αρχείο</string>
-    <string name="noUnarchivedCardsMessage">Δεν υπάρχουν αρχειοθετημένες κάρτες</string>
     <string name="updateBalanceTitle">Πόσα ξοδέψατε;</string>
     <string name="cameraPermissionDeniedTitle">Αδύνατη η πρόσβαση στην κάμερα</string>
     <string name="failedToRetrieveImageFile">Αποτυχία ανάκτησης αρχείου εικόνας</string>

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

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

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
-    <string name="barcodeNoBarcode">Strekokodo mankas al karto</string>
     <string name="delete">Forigi</string>
     <string name="noBarcode">Sen strekokodo</string>
     <string name="barcodeType">Tipo de strekokodo</string>
@@ -65,8 +64,6 @@
     <string name="importExportHelp">Subtenanta supre vian kartoj permesas vin movi ilin al alia aparato.</string>
     <string name="failedParsingImportUriError">Ne eblis analizi la importado URI</string>
     <string name="noCardExistsError">Ne eblis trovi karto</string>
-    <string name="noCardIdError">Neniu karto ID eniris</string>
-    <string name="noStoreError">Neniu eniris nomo</string>
     <string name="noCardsMessage">Aldoni karto unua</string>
     <string name="cardShortcut">Karto Mallongirejo</string>
     <string name="scanCardBarcode">Scintigrafio Barcode Card</string>

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

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

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

@@ -10,7 +10,7 @@
     <string name="edit">Editar</string>
     <string name="delete">Eliminar</string>
     <string name="confirm">Confirmar</string>
-    <string name="ok">Aceptar</string>
+    <string name="ok">De acuerdo</string>
     <string name="copy_to_clipboard">Copiar ID. en portapapeles</string>
     <string name="sendLabel">Enviar…</string>
     <string name="editCardTitle">Editar tarjeta</string>
@@ -18,8 +18,6 @@
     <string name="scanCardBarcode">Escanear código de barras</string>
     <string name="cardShortcut">Atajo de tarjeta</string>
     <string name="noCardsMessage">Añada una tarjeta primero</string>
-    <string name="noStoreError">No se proporcionó ningún nombre</string>
-    <string name="noCardIdError">No se ha introducido ninguna código</string>
     <string name="noCardExistsError">No se ha podido encontrar esa tarjeta</string>
     <string name="importExport">Importar/Exportar</string>
     <string name="exportName">Exportar</string>
@@ -51,13 +49,11 @@
     <string name="settings_light_theme">Claro</string>
     <string name="settings_system_theme">Sistema</string>
     <string name="settings_theme">Tema</string>
-    <string name="enterBarcodeInstructions">Introduzca el código, y elija un tipo de código de barras a continuación, o «No hay código de barras».</string>
     <string name="app_copyright_old">Basado en Loyalty Card Keychain
 \nderechos de autor © 2016-2020 de Branden Archer</string>
     <string name="exportOptionExplanation">Los datos se guardarán en la ubicación que elija.</string>
     <string name="failedParsingImportUriError">No se pudo procesar el URI de importación</string>
     <string name="share">Compartir</string>
-    <string name="barcodeNoBarcode">No hay código de barras</string>
     <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>
@@ -94,7 +90,7 @@
     <string name="card">Tarjeta</string>
     <string name="expiryStateSentenceExpired">Expirado: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Expira: <xliff:g>%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Derechos de autor © 2019-<xliff:g>%d</xliff:g> de Sylvia van Os</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Derechos de autor © 2019-<xliff:g>%d</xliff:g> Sylvia van Os y colaboradores</string>
     <string name="app_resources">Recursos de terceros libres: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Bibliotecas de terceros libres: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="importCatimaMessage">Seleccione su <i>catima.zip</i> exportado desde Catima para importarlo.
@@ -142,7 +138,6 @@
     <string name="privacy_policy">Política de privacidad</string>
     <string name="app_loyalty_card_keychain">Llavero con tarjeta de fidelización</string>
     <string name="chooseImportType">Importar datos de</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> no tendría un saldo válido.</string>
     <string name="currency">Moneda</string>
     <string name="balance">Saldo</string>
     <string name="errorReadingImage">No se pudo leer la imagen</string>
@@ -211,9 +206,7 @@
     <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="action_hide_details">Ocultar detalles</string>
     <string name="translate_platform">en Weblate</string>
-    <string name="action_show_details">Mostrar detalles</string>
     <string name="selectColor">Seleccione el color</string>
     <string name="setIcon">Establecer una miniatura</string>
     <string name="sort">Ordenar</string>
@@ -240,8 +233,6 @@
     <string name="archive">Archivar</string>
     <string name="archived">Tarjeta archivada</string>
     <string name="unarchived">Tarjeta desarchivada</string>
-    <string name="archiveList">Archivo</string>
-    <string name="noUnarchivedCardsMessage">No existen tarjetas sin archivar</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>
     <plurals name="groupCardCountWithArchived">
@@ -290,4 +281,8 @@
     <string name="settings_category_title_general">General</string>
     <string name="settings_disable_lockscreen_while_viewing_card_summary">Deshabilita el bloqueo de pantalla mientras se ve una tarjeta</string>
     <string name="settings_category_title_privacy">Privacidad</string>
+    <string name="view_online">Ver en línea</string>
+    <string name="show_archived_cards">Mostrar las tarjetas archivadas</string>
+    <string name="app_copyright_short">Derechos de autor © Sylvia van Os y colaboradores</string>
+    <string name="action_display_options">Opciones de la pantalla</string>
 </resources>

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

@@ -30,7 +30,6 @@
     <string name="privacy_policy">Tietosuojakäytäntö</string>
     <string name="app_loyalty_card_keychain">Kanta-asiakaskortin avainnippu</string>
     <string name="chooseImportType">Tuo tietoja kohteesta</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> ei vaikuta olevan kelvollinen saldo.</string>
     <string name="points">Pisteet</string>
     <string name="currency">Valuutta</string>
     <string name="balance">Saldo</string>
@@ -76,7 +75,6 @@
     <string name="starImage">Suosikkitähti</string>
     <string name="thumbnailDescription">Pienoiskuva</string>
     <string name="copy_to_clipboard_toast">ID-tunnus kopioitu leikepöydälle</string>
-    <string name="enterBarcodeInstructions">Syötä ID-tunnus ja valitse sen viivakoodityyppi, tai valitse \"Ei viivakoodia\".</string>
     <string name="selectBarcodeTitle">Valitse viivakoodi</string>
     <string name="app_resources">Vapaat kolmannen osapuolen resurssit: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Vapaat kolmannen osapuolen kirjastot: <xliff:g id="app_libraries_list">%s</xliff:g></string>
@@ -85,7 +83,7 @@
     <string name="app_license">Copyleft (käyttäjänoikeus) - vapaa ohjelmisto, lisenssi GPLv3+</string>
     <string name="app_copyright_old">Perustuu Loyalty Card Keychain -sovellukseen
 \ntekijänoikeus © 2016–2020 Branden Archer</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Tekijänoikeus © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Tekijänoikeus © 2019–<xliff:g>%d</xliff:g> Sylvia van Os ja avustajat</string>
     <string name="about">Tietoja</string>
     <string name="importOptionApplicationButton">Käytä toista sovellusta</string>
     <string name="importOptionApplicationExplanation">Käytä mitä tahansa sovellusta tai suosikkitiedostonhallintaasi tiedoston avaamiseen.</string>
@@ -107,8 +105,6 @@
     <string name="importExport">Tuo/vie</string>
     <string name="failedParsingImportUriError">Tuonnin URI: n jäsentäminen epäonnistui</string>
     <string name="noCardExistsError">Tätä korttia ei löytynyt</string>
-    <string name="noCardIdError">ID-tunnusta ei annettu</string>
-    <string name="noStoreError">Nimeä ei annettu</string>
     <string name="card_ids_copied">Kopioidut tunnukset</string>
     <string name="noCardsMessage">Lisää ensin kortti</string>
     <string name="cardShortcut">Kortin pikakuvake</string>
@@ -127,7 +123,6 @@
     <string name="unstar">Poista suosikeista</string>
     <string name="star">Lisää suosikkeihin</string>
     <string name="noBarcode">Ei viivakoodia</string>
-    <string name="barcodeNoBarcode">Viivakoodia ei ole</string>
     <string name="barcodeType">Viivakoodin tyyppi</string>
     <string name="cardId">Kortin ID-tunnus</string>
     <string name="note">Lisätieto</string>
@@ -202,8 +197,6 @@
     <string name="and_data_usage">ja datan käyttö</string>
     <string name="on_google_play">Google Playssa</string>
     <string name="report_error">Ilmoita virheestä</string>
-    <string name="action_show_details">Näytä tiedot</string>
-    <string name="action_hide_details">Piilota tiedot</string>
     <string name="shortcutSelectCard">Valitse kortti</string>
     <string name="starred">Tähdellä merkityt</string>
     <string name="options">Vaihtoehdot</string>
@@ -222,12 +215,10 @@
     <string name="settings_portrait_orientation">Pysty</string>
     <string name="settings_landscape_orientation">Vaaka</string>
     <string name="unarchived">Kortti on poistettu arkistosta</string>
-    <string name="noUnarchivedCardsMessage">Arkistoimattomia kortteja ei ole olemassa</string>
     <string name="unarchive">Poista arkistosta</string>
     <string name="archived">Kortti arkistoitu</string>
     <string name="failedLaunchingPhotoPicker">Tuettua galleriasovellusta ei löytynyt</string>
     <string name="settings_card_orientation">Viivakoodin suuntaus</string>
-    <string name="archiveList">Arkisto</string>
     <plurals name="groupCardCountWithArchived">
         <item quantity="one"><xliff:g>%1$d</xliff:g> kortti (<xliff:g id="archivedCount">%2$d</xliff:g> arkistoitu)</item>
         <item quantity="other"><xliff:g>%1$d</xliff:g> korttia (<xliff:g id="archivedCount">%2$d</xliff:g> arkistoitu)</item>
@@ -283,4 +274,7 @@
     <string name="show_validity">Näytä kelpoisuus</string>
     <string name="settings_category_title_cards">Kortit</string>
     <string name="settings_category_title_general">Yleiset</string>
+    <string name="action_display_options">Näyttövalinnat</string>
+    <string name="app_copyright_short">Tekijänoikeus © Sylvia van Os ja avustajat</string>
+    <string name="show_archived_cards">Näytä arkistoidut kortit</string>
 </resources>

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

@@ -18,8 +18,6 @@
     <string name="scanCardBarcode">Scanner le code-barres</string>
     <string name="cardShortcut">Raccourci de carte</string>
     <string name="noCardsMessage">Ajoutez d’abord une carte</string>
-    <string name="noStoreError">Aucun nom saisi</string>
-    <string name="noCardIdError">Aucun identifiant saisi</string>
     <string name="noCardExistsError">Impossible de trouver cette carte</string>
     <string name="importExport">Importer/Exporter</string>
     <string name="exportName">Exporter</string>
@@ -54,13 +52,11 @@
     <string name="settings_light_theme">Clair</string>
     <string name="settings_system_theme">Système</string>
     <string name="settings_theme">Thème</string>
-    <string name="enterBarcodeInstructions">Entrez l’identifiant, et choisissez un type de code-barres ci-dessous, ou « Il n’y a pas de code-barres ».</string>
     <string name="app_copyright_old">Basé sur Loyalty Card Keychain
 \ncopyright © 2016-2020 Branden Archer</string>
     <string name="exportOptionExplanation">Les données seront exportées vers l’emplacement de votre choix.</string>
     <string name="failedParsingImportUriError">Impossible d’analyser l’URI d’importation</string>
     <string name="share">Partager</string>
-    <string name="barcodeNoBarcode">Il n’y a pas de code-barres</string>
     <string name="barcodeType">Type de code-barres</string>
     <string name="noMatchingGiftCards">Aucun résultat. Essayez de modifier votre recherche.</string>
     <string name="action_search">Rechercher</string>
@@ -92,7 +88,6 @@
     <string name="privacy_policy">Politique de confidentialité</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="chooseImportType">Importer les données depuis</string>
-    <string name="parsingBalanceFailed"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> ne semble pas être un solde valide.</string>
     <string name="points">Points</string>
     <string name="currency">Devise</string>
     <string name="balance">Solde</string>
@@ -129,7 +124,6 @@
     <string name="wrongValueForBarcodeType">La valeur n’est pas valide pour le type de code-barres sélectionné</string>
     <string name="app_resources">Ressources tierces libres : <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Bibliothèques tierces libres : <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="intent_import_card_from_url_share_multiple_text">Je veux partager des cartes avec vous</string>
     <string name="copy_to_clipboard_multiple_toast">Identifiants copiés dans le presse-papiers</string>
     <string name="card_ids_copied">Numéro(s) copié(s)</string>
@@ -186,7 +180,7 @@
     <string name="sort">Trier</string>
     <string name="sort_by">Trier par</string>
     <string name="reverse">… dans l’ordre inverse</string>
-    <string name="sort_by_expiry">Date d’expiration</string>
+    <string name="sort_by_expiry">Expiration</string>
     <string name="sort_by_most_recently_used">Les plus récemment utilisées</string>
     <string name="sort_by_name">Nom</string>
     <string name="report_error">Signaler une erreur</string>
@@ -209,8 +203,6 @@
     <string name="group_name_is_empty">Le nom du groupe ne peut pas être vide</string>
     <string name="setIcon">Définir la vignette</string>
     <string name="selectColor">Sélectionnez la couleur</string>
-    <string name="action_show_details">Afficher les détails</string>
-    <string name="action_hide_details">Masquer les détails</string>
     <string name="translate_platform">sur Weblate</string>
     <string name="shortcutSelectCard">Sélectionnez une carte</string>
     <string name="options">Options</string>
@@ -233,8 +225,6 @@
     <string name="unarchive">Désarchiver</string>
     <string name="archived">Carte archivée</string>
     <string name="unarchived">Carte désarchivée</string>
-    <string name="archiveList">Archives</string>
-    <string name="noUnarchivedCardsMessage">Il n\'existe aucune carte non archivée</string>
     <string name="failedLaunchingPhotoPicker">Impossible de trouver une application de galerie prise en charge</string>
     <plurals name="groupCardCountWithArchived">
         <item quantity="one"><xliff:g>%1$d</xliff:g> carte (<xliff:g id="archivedCount">%2$d</xliff:g> archivée)</item>
@@ -254,14 +244,14 @@
     <string name="failedToRetrieveImageFile">Impossible de récupérer le fichier image</string>
     <string name="currentBalanceSentence">Solde actuel : <xliff:g>%s</xliff:g></string>
     <string name="updateBalanceHint">Entrez le montant</string>
-    <string name="cameraPermissionDeniedTitle">Impossible d\'accéder à la caméra</string>
+    <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="newBalanceSentence">Nouveau solde : <xliff:g>%s</xliff:g></string>
     <string name="importCards">Importer des cartes</string>
-    <string name="storageReadPermissionRequired">L\'autorisation de lire le stockage est nécessaire pour cette action…</string>
-    <string name="cameraPermissionRequired">L\'autorisation d\'accéder à la caméra est nécessaire pour cette action…</string>
+    <string name="storageReadPermissionRequired">L’autorisation de lire le stockage est nécessaire pour cette action…</string>
+    <string name="cameraPermissionRequired">L’autorisation d\'accéder à la caméra est nécessaire pour cette action…</string>
     <string name="validFromDate">Valide à partir de</string>
     <string name="validFromSentence">Valide à partir de : <xliff:g>%s</xliff:g></string>
     <string name="anyDate">N’importe quelle date</string>
@@ -290,4 +280,9 @@
     <string name="settings_category_title_general">Généraux</string>
     <string name="settings_category_title_privacy">Confidentialité</string>
     <string name="settings_disable_lockscreen_while_viewing_card_summary">Désactive le verrouillage de l\'écran pendant la visualisation d\'une carte</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os et contributeurs</string>
+    <string name="app_copyright_short">Copyright © Sylvia van Os et contributeurs</string>
+    <string name="show_archived_cards">Afficher les cartes archivées</string>
+    <string name="view_online">Voir en ligne</string>
+    <string name="action_display_options">Options d’affichage</string>
 </resources>

app/src/main/res/values-he-rIL/strings.xml

@@ -10,7 +10,6 @@
     <string name="share">שיתוף</string>
     <string name="copy_to_clipboard">העתקת מזהה ללוח</string>
     <string name="addCardTitle">הוספת כרטיס</string>
-    <string name="noCardIdError">אין מזהה כרטיס</string>
     <string name="star">הוספה למועדפים</string>
     <string name="unstar">הסרה ממועדפים</string>
     <string name="note">הערות</string>
@@ -28,7 +27,6 @@
     <string name="failedParsingImportUriError">נתיב לא נמצא</string>
     <string name="noMatchingGiftCards">אין תוצאות. נסה חיפוש אחר.</string>
     <string name="storeName">שם חנות</string>
-    <string name="barcodeNoBarcode">אין ברקוד</string>
     <string name="delete">מחיקה</string>
     <string name="confirm">אישור</string>
     <string name="deleteTitle">מחק כרטיס</string>
@@ -39,7 +37,6 @@
     <string name="cardShortcut">קיצור דרך</string>
     <string name="noCardsMessage">תחילה הוסף כרטיס</string>
     <string name="card_ids_copied">מזהי כרטיס הועתקו</string>
-    <string name="noStoreError">לא הוכנס שם חנות</string>
     <string name="noCardExistsError">כרטיס לא נמצא</string>
     <string name="importExport">ייבוא/ייצוא</string>
     <string name="exportName">ייצוא</string>

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

@@ -20,8 +20,6 @@
     <string name="addCardTitle">कार्ड जोड़ें</string>
     <string name="noCardsMessage">पहले एक कार्ड जोड़ें</string>
     <string name="card_ids_copied">कॉपी की गई आईडी</string>
-    <string name="noStoreError">कोई नाम दर्ज नहीं</string>
-    <string name="noCardIdError">कोई पहचान पत्र (आईडी दर्ज नहीं) की गई</string>
     <string name="noCardExistsError">वह कार्ड नहीं मिला</string>
     <string name="importExport">आयात / निर्यात</string>
     <string name="exportName">निर्यात</string>
@@ -70,7 +68,6 @@
     <string name="importOptionApplicationExplanation">फाइल खोलने के लिए कोई भी ऐप या अपना पसंदिता फाइल मैनेजर का इस्तेमाल करे।</string>
     <string name="settings_theme">विषय</string>
     <string name="barcodeType">बारकोड का प्रकार</string>
-    <string name="barcodeNoBarcode">कोई बारकोड नहीं है</string>
     <string name="noBarcode">बारकोड नहीं है</string>
     <string name="copy_to_clipboard">पहचान पत्र(आई डी) को क्लिपबोर्ड में कॉपी करें</string>
     <string name="scanCardBarcode">बारकोड स्कैन करें</string>
@@ -79,7 +76,6 @@
     <string name="importExportHelp">तथ्य (डाटा) को बैकअप करना हमें उसे दूसरे डिवाइस में भेजने देता है|</string>
     <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> का बारकोड</string>
     <string name="settings_disable_lockscreen_while_viewing_card">स्क्रीन को लॉक होने से रोकें</string>
-    <string name="enterBarcodeInstructions">अपनी आई डी लिखें तथा या तो बारकोड प्रकार चुनें, या फिर कोई बारकोड नहीं है चुनें|</string>
     <string name="settings_lock_on_opening_orientation">कार्ड खोलते समय प्रयोग करि गयी अवस्था को प्रतिबन्ध करें</string>
     <string name="intent_import_card_from_url_share_text">मैं तुम्हें एक कार्ड भेजना चाहता हूँ</string>
     <string name="selectBarcodeTitle">बारकोड चुनें</string>
@@ -137,7 +133,6 @@
     <string name="addManually">मैन्युअली आई डी दर्ज करें</string>
     <string name="editGroup">समूह संपादन: <xliff:g>%s</xliff:g></string>
     <string name="points">अंक</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> एक वैध शेष राशि नहीं है.</string>
     <string name="chooseImportType">यहाँ से डेटा का आयात करें</string>
     <string name="privacy_policy">निजता नीति</string>
     <string name="importCatima">कैटिमा से आयात करें</string>
@@ -145,4 +140,7 @@
     <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g> के बारे में</string>
     <string name="debug_version_fmt">संस्करण: <xliff:g id="version">%s</xliff:g></string>
     <string name="copy_to_clipboard_toast">आई डी क्लिपबोर्ड पर कॉपी किया गया</string>
-</resources>
+    <string name="cameraPermissionRequired">इस क्रिया के लिए कैमरा एक्सेस की अनुमति चाहिए।…</string>
+    <string name="permissionReadCardsLabel">केटीमा कार्ड्स पढ़ें</string>
+    <string name="storageReadPermissionRequired">स्टोरेज पढ़ने की इजाजत इस क्रिया के लिए आवश्यक है…</string>
+</resources>

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

@@ -25,10 +25,8 @@
     <string name="noMatchingGiftCards">Nema rezultata. Pokušajte promijeniti pretraživanje.</string>
     <string name="cardId">ID kartice</string>
     <string name="barcodeType">Vrsta crtičnog koda</string>
-    <string name="barcodeNoBarcode">Ne postoji crtični kod</string>
     <string name="cancel">Odustani</string>
     <string name="noGiftCards">Pritisni gumb + plus za dodavanje kartice ili uvezi putem izbornika ⋮.</string>
-    <string name="noStoreError">Ime nije zadano</string>
     <string name="noCardExistsError">Nije bilo moguće pronaći tu karticu</string>
     <string name="failedParsingImportUriError">Nije bilo moguće obraditi URI uvoza</string>
     <string name="importExport">Uvoz/Izvoz</string>
@@ -96,7 +94,6 @@
     <string name="importLoyaltyCardKeychainMessage">Odaberi tvoju iz LoyaltyCardKeychain izvezenu <i>LoyaltyCardKeychain.csv</i> datoteku koju želiš uvesti.
 \nStvori je putem izbornika „Uvoz/Izvoz” u aplikaciji LoyaltyCardKeychain i tamo najprije pritisni „Izvoz”.</string>
     <string name="updateBarcodeQuestionText">Promijenio/la si ID. Želiš li također aktualizirati crtični kod da koristi istu vrijednost\?</string>
-    <string name="action_hide_details">Sakrij detalje</string>
     <string name="importCards">Uvezi kartice</string>
     <string name="selectColor">Odaberi boju</string>
     <string name="setIcon">Postavi sličicu</string>
@@ -105,7 +102,6 @@
     <string name="settings_grey_theme">Siva</string>
     <string name="sort_by_expiry">Istek</string>
     <string name="barcodeImageDescriptionWithType">Slika vrste crtičnog koda <xliff:g>%s</xliff:g></string>
-    <string name="noCardIdError">ID nije zadan</string>
     <string name="importLoyaltyCardKeychain">Uvezi iz Loyalty Card Keychain</string>
     <string name="frontImageDescription">Prednja slika</string>
     <string name="exportPasswordHint">Upiši lozinku</string>
@@ -132,13 +128,11 @@
     <string name="archived">Kartica je arhivirana</string>
     <string name="unarchived">Kartica je dearhivirana</string>
     <string name="failedLaunchingPhotoPicker">Nije bilo moguće pronaći aplikaciju za galeriju</string>
-    <string name="archiveList">Arhiva</string>
     <string name="cameraPermissionDeniedTitle">Nije bilo moguće pristupiti kameri</string>
     <string name="noCameraPermissionDirectToSystemSetting">Za snimanje crtičnih kodova Catima treba pristup tvojoj kameri. Dodirni ovdje za mijenjanje postavki dozvola.</string>
     <string name="app_libraries">Libre biblioteke trećih strana: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Biranje crtičnog koda</string>
     <string name="copy_to_clipboard_toast">ID je kopiran u međuspremnik</string>
-    <string name="enterBarcodeInstructions">Upiši ID i dolje odaberi vrstu crtičnog koda ili „Ne postoji crtični kod”.</string>
     <string name="settings_portrait_orientation">Okomito</string>
     <string name="settings_lock_on_opening_orientation">Zaključaj na položaj koji se koristi prilikom otvaranja kartice</string>
     <string name="group_edit">Uredi grupu</string>
@@ -147,7 +141,6 @@
     <string name="balance">Saldo</string>
     <string name="chooseImportType">Uvezi podatke iz</string>
     <string name="app_loyalty_card_keychain">Privjesak za Karticu Vjernosti</string>
-    <string name="parsingBalanceFailed">Čini se da <xliff:g>%s</xliff:g> nije ispravni saldo.</string>
     <string name="privacy_policy_popup_text">Obavijest o politici privatnosti (obavezna za neke trgovine aplikacija):
 \n
 \nPODACI SE UOPĆE NE PRIKUPLJAJU, što svatko može potvrditi budući da je naša aplikacija libre softver.</string>
@@ -260,9 +253,7 @@
     <string name="sort_by_name">Ime</string>
     <string name="sort_by_most_recently_used">Nedavno korišteno</string>
     <string name="reverse">… u obrnutom redoslijedu</string>
-    <string name="action_show_details">Prikaži detalje</string>
     <string name="shortcutSelectCard">Odaberi karticu</string>
-    <string name="noUnarchivedCardsMessage">Ne postoje nearhivirane kartice</string>
     <string name="previousCard">Prethodna</string>
     <string name="nextCard">Sljedeća</string>
     <string name="updateBalanceTitle">Koliko si potrošio/la\?</string>

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

@@ -14,7 +14,6 @@
     <string name="note">Feljegyzés</string>
     <string name="cardId">Kártyaazonosító</string>
     <string name="barcodeType">Vonalkód típusa</string>
-    <string name="barcodeNoBarcode">Nincs vonalkód</string>
     <string name="noBarcode">Nincs vonalkód</string>
     <string name="star">Hozzáadás a kedvencekhez</string>
     <string name="unstar">Eltávolítás a kedvencekből</string>
@@ -36,7 +35,6 @@
     <string name="addCardTitle">Kártya hozzáadása</string>
     <string name="scanCardBarcode">Vonalkód leolvasása</string>
     <string name="cardShortcut">Kártya parancsikon</string>
-    <string name="noStoreError">Nincs név megadva</string>
     <string name="failedParsingImportUriError">Az importálási URI nem értelmezhető</string>
     <string name="importExport">Importálás/exportálás</string>
     <string name="exportName">Exportálás</string>
@@ -53,7 +51,6 @@
     <string name="deleteTitle">Kártya törlése</string>
     <string name="card_ids_copied">Azonosító(k) másolva</string>
     <string name="barcodeImageDescriptionWithType">A(z) <xliff:g>%s</xliff:g> vonalkód képe</string>
-    <string name="noCardIdError">Nincs azonosító megadva</string>
     <string name="noCardExistsError">A kártya nem található</string>
     <string name="importStocardMessage">Válassza ki az importálandó <i>***.zip</i> Stocard export fájlt.
 \nAz adatainak exportálását a support@stocardapp.com címre írt levélben kérheti.</string>
@@ -70,8 +67,6 @@
     <string name="settings_grey_theme">Szürke</string>
     <string name="sort">Rendezés</string>
     <string name="on_google_play">a Google Playen</string>
-    <string name="action_show_details">Részletek megjelenítése</string>
-    <string name="action_hide_details">Részletek elrejtése</string>
     <string name="and_data_usage">és adathasználat</string>
     <string name="translate_platform">a Weblate-en</string>
     <string name="sort_by_name">Név</string>
@@ -86,13 +81,11 @@
     <string name="importOptionFilesystemButton">A fájlrendszerből</string>
     <string name="importOptionApplicationTitle">Másik alkalmazás használata</string>
     <string name="importOptionApplicationExplanation">A fájl megnyitásához használjon egy tetszőleges alkalmazást, vagy a kedvenc fájlkezelőjét.</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="app_license">Copyleft licencű szabad szoftver, GPLv3+ alatt közzétéve</string>
     <string name="about_title_fmt">A <xliff:g id="app_name">%s</xliff:g> névjegye</string>
     <string name="debug_version_fmt">Verzió: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_resources">Szabad külső erőforrások: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Vonalkód kiválasztása</string>
-    <string name="enterBarcodeInstructions">Írja be az azonosítót, majd válasszon egy vonalkódot, vagy a „Nincs vonalkód” lehetőséget.</string>
     <string name="copy_to_clipboard_toast">Azonosító vágólapra másolva</string>
     <string name="starImage">Kedvencek csillag</string>
     <string name="settings">Beállítások</string>
@@ -130,7 +123,6 @@
     <string name="balance">Egyenleg</string>
     <string name="currency">Pénznem</string>
     <string name="points">Pontok</string>
-    <string name="parsingBalanceFailed">A(z) <xliff:g>%s</xliff:g> nem tűnik valós egyenlegnek.</string>
     <string name="app_loyalty_card_keychain">Hűségkártya-kulcstartó</string>
     <string name="privacy_policy">Adatvédelmi irányelvek</string>
     <string name="accept">Elfogadás</string>
@@ -221,7 +213,6 @@
         <item quantity="one"><xliff:g>%1$d</xliff:g> kártya (<xliff:g id="archivedCount">%2$d</xliff:g> archiválva)</item>
         <item quantity="other"><xliff:g>%1$d</xliff:g> kártya (<xliff:g id="archivedCount">%2$d</xliff:g> archiválva)</item>
     </plurals>
-    <string name="noUnarchivedCardsMessage">Nincs archiválatlan kártya</string>
     <string name="failedToOpenUrl">Először telepítsen egy webböngészőt</string>
     <string name="failedLaunchingPhotoPicker">Nem található támogatott galéria alkalmazás</string>
     <string name="previousCard">Előző</string>
@@ -235,7 +226,6 @@
     <string name="archive">Archiválás</string>
     <string name="unarchive">Archiválás megszüntetése</string>
     <string name="archived">Kártya archiválva</string>
-    <string name="archiveList">Archívum</string>
     <string name="duplicateCard">Klónozás</string>
     <string name="currentBalanceSentence">Jelenlegi egyenleg: <xliff:g>%s</xliff:g></string>
     <string name="updateBalanceHint">Adja meg az összeget</string>
@@ -283,4 +273,5 @@
     <string name="settings_keep_screen_on_summary">Letiltja a képernyő időtúllépését a kártya megtekintése közben</string>
     <string name="settings_disable_lockscreen_while_viewing_card_summary">Letiltja a képernyő időtúllépését a kártya megjelenítése közben</string>
     <string name="settings_allow_content_provider_read_summary">Az alkalmazásoknak továbbra is engedélyt kell kérniük a hozzáféréshez</string>
+    <string name="view_online">Megtekintés online</string>
 </resources>

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

@@ -26,7 +26,6 @@
     <string name="editCardTitle">Ubah Kartu</string>
     <string name="addCardTitle">Tambah Kartu</string>
     <string name="scanCardBarcode">Pindai Barcode</string>
-    <string name="barcodeNoBarcode">Tidak ada barcode</string>
     <string name="cancel">Batalkan</string>
     <string name="importExport">Impor/Ekspor</string>
     <string name="settings_theme">Tema</string>
@@ -79,8 +78,6 @@
     <string name="copy_to_clipboard">Salin ID ke papan klip</string>
     <string name="sendLabel">Kirim…</string>
     <string name="noCardsMessage">Tambah kartu terlebih dahulu</string>
-    <string name="noStoreError">Nama masih kosong</string>
-    <string name="noCardIdError">Tidak ada ID yang dimasukkan</string>
     <string name="noCardExistsError">Tidak dapat menemukan kartu</string>
     <string name="failedParsingImportUriError">Tidak dapat memparsing impor URI</string>
     <string name="exportName">Ekspor</string>
@@ -100,7 +97,7 @@
     <string name="importOptionApplicationExplanation">Gunakan aplikasi lain atau pengelola file favorit anda untuk membuka file.</string>
     <string name="importOptionApplicationButton">Gunakan aplikasi lain</string>
     <string name="about">Tentang</string>
-    <string name="app_copyright_fmt">Hak Cipta © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_copyright_fmt">Hak Cipta © 2019–<xliff:g>%d</xliff:g> Sylvia van Os dan para kontributor</string>
     <string name="app_copyright_old">Berdasarkan Loyalty Card Keychain 
 \nhak cipta © 2016–2020 Branden Archer</string>
     <string name="app_license">Perangkat lunak bebas copyleft, berlisensi GPLv3+</string>
@@ -108,7 +105,6 @@
     <string name="debug_version_fmt">Versi: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_libraries">Pustaka pihak ketiga gratis: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources">Sumber daya pihak ketiga gratis: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="enterBarcodeInstructions">Masukkan ID, dan pilih jenis barcode di bawah ini, atau \"Tidak ada barcode\".</string>
     <string name="copy_to_clipboard_toast">ID disalin ke papan klip</string>
     <string name="thumbnailDescription">Gambar tampilan</string>
     <string name="starImage">Favorit</string>
@@ -140,7 +136,6 @@
     <string name="never">Tidak pernah</string>
     <string name="moveBarcodeToTopOfScreen">Pindah barcode ke bagian paling depan</string>
     <string name="points">Poin</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> sepertinya bukan saldo yang valid.</string>
     <string name="app_loyalty_card_keychain">Gantungan kunci kartu kesetiaan</string>
     <string name="privacy_policy">Kebijakan Privasi</string>
     <string name="privacy_policy_popup_text">Pemberitahuan kebijakan privasi (diperlukan oleh beberapa toko aplikasi): 
@@ -206,8 +201,6 @@
         <item quantity="other"><xliff:g>%1$d</xliff:g> kartu (<xliff:g id="archivedCount">%2$d</xliff:g> diarsipkan)</item>
     </plurals>
     <string name="translate_platform">di Weblate</string>
-    <string name="action_show_details">Tampilkan detail</string>
-    <string name="action_hide_details">Sembunyikan detail</string>
     <string name="welcome">Selamat datang di Catima</string>
     <string name="failedToOpenUrl">Install browser web terlebih dahulu</string>
     <plurals name="viewArchivedCardsWithCount">
@@ -230,12 +223,10 @@
     <string name="duplicateCard">Duplikat</string>
     <string name="archive">Arsip</string>
     <string name="archived">Kartu diarsipkan</string>
-    <string name="archiveList">Arsip</string>
     <string name="failedToRetrieveImageFile">Gagal mengambil file gambar</string>
     <string name="barcodeLongPressMessage">Hanya gambar yang dapat dibuka di aplikasi galeri</string>
     <string name="unarchive">Ekstrak</string>
     <string name="unarchived">Kartu tidak diarsipkan</string>
-    <string name="noUnarchivedCardsMessage">Tidak ada kartu yang diekstrak</string>
     <string name="options">Opsi</string>
     <string name="starred">Berbintang</string>
     <string name="importCards">Import kartu</string>
@@ -276,4 +267,8 @@
     <string name="settings_disable_lockscreen_while_viewing_card_summary">Menonaktifkan kunci layar saat melihat kartu</string>
     <string name="settings_category_title_cards">Kartu</string>
     <string name="settings_category_title_privacy">Privasi</string>
+    <string name="show_archived_cards">Tampilkan kartu yang sudah disimpan</string>
+    <string name="action_display_options">Pilihan tampilan</string>
+    <string name="view_online">Lihat di Internet</string>
+    <string name="app_copyright_short">Terdapat Hak Cipta © Sylvia van Os dan para kontributor</string>
 </resources>

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

@@ -10,7 +10,6 @@
     <string name="cancel">Hætta</string>
     <string name="noMatchingGiftCards">Engar niðurstöður. Prófaðu að breyta leitarorði.</string>
     <string name="storeName">Nafnið</string>
-    <string name="barcodeNoBarcode">Þetta kort hefur ekki strikamerkið</string>
     <string name="star">Bæta við eftirlæti</string>
     <string name="unstar">Fjarlægja frá eftirlæti</string>
     <string name="save">Sparaðu</string>
@@ -26,7 +25,6 @@
     <string name="noCardsMessage">Bæta kort fyrstu</string>
     <string name="exportFailedTitle">Flytja mistókst</string>
     <string name="exportSuccessfulTitle">Flutt</string>
-    <string name="noStoreError">Ekkert nafn slegið</string>
     <string name="noCardExistsError">Gæti ekki fundið kort</string>
     <string name="failedParsingImportUriError">Get ekki lesið inn URI</string>
     <string name="exportName">Flytja</string>

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

@@ -7,7 +7,6 @@
     <string name="storeName">Nome</string>
     <string name="note">Note</string>
     <string name="cardId">Codice</string>
-    <string name="barcodeNoBarcode">Non c\'è un codice a barre</string>
     <string name="cancel">Annulla</string>
     <string name="save">Salva</string>
     <string name="edit">Modifica</string>
@@ -22,8 +21,6 @@
     <string name="scanCardBarcode">Scansiona il codice</string>
     <string name="cardShortcut">Scorciatoia per la carta</string>
     <string name="noCardsMessage">Aggiungi prima una carta</string>
-    <string name="noStoreError">Nessun nome inserito</string>
-    <string name="noCardIdError">Nessun codice inserito</string>
     <string name="noCardExistsError">Impossibile trovare quella carta</string>
     <string name="failedParsingImportUriError">Impossibile analizzare l\'URI di importazione</string>
     <string name="importExport">Importa/Esporta</string>
@@ -48,7 +45,6 @@
     <string name="about_title_fmt">Informazioni su <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versione: <xliff:g id="version">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Seleziona codice a barre</string>
-    <string name="enterBarcodeInstructions">Inserisci il codice e scegli un tipo di codice a barre sotto oppure seleziona «Non c\'è un codice a barre».</string>
     <string name="copy_to_clipboard_toast">Codice copiato negli appunti</string>
     <string name="thumbnailDescription">Miniatura</string>
     <string name="settings">Impostazioni</string>
@@ -85,7 +81,6 @@
         <item quantity="many"><xliff:g>%d</xliff:g> carte</item>
         <item quantity="other"><xliff:g>%d</xliff:g> carte</item>
     </plurals>
-    <string name="parsingBalanceFailed"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> non sembra un saldo corretto.</string>
     <string name="points">Punti</string>
     <string name="currency">Valuta</string>
     <string name="balance">Saldo</string>
@@ -99,7 +94,7 @@
     <string name="expiryStateSentenceExpired">Scaduta: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Scadenza: <xliff:g>%s</xliff:g></string>
     <string name="settings_keep_screen_on">Mantieni lo schermo attivo</string>
-    <string name="app_loyalty_card_keychain">Carte fedeltà</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="chooseImportType">Importa i dati da</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Impedisci il blocco dello schermo</string>
     <string name="accept">Accetta</string>
@@ -129,7 +124,6 @@
     <string name="wrongValueForBarcodeType">Il valore non è valido per il tipo di codice a barre selezionato</string>
     <string name="app_resources">Risorse libere di terze parti: <xliff:g id="app_resources_list"> %s </xliff:g></string>
     <string name="app_libraries">Librerie libere di terze parti: <xliff:g id="app_libraries_list"> %s </xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="intent_import_card_from_url_share_multiple_text">Voglio condividere alcune carte con te</string>
     <string name="copy_to_clipboard_multiple_toast">Codici copiati negli appunti</string>
     <string name="card_ids_copied">Codice/i copiato/i</string>
@@ -209,8 +203,6 @@
     <string name="group_updated">Gruppo aggiornato</string>
     <string name="selectColor">Seleziona il colore</string>
     <string name="setIcon">Imposta l\'immagine</string>
-    <string name="action_show_details">Mostra i dettagli</string>
-    <string name="action_hide_details">Nascondi i dettagli</string>
     <string name="translate_platform">su Weblate</string>
     <string name="shortcutSelectCard">Seleziona una tessera</string>
     <string name="options">Opzioni</string>
@@ -228,8 +220,6 @@
     <string name="duplicateCard">Duplica</string>
     <string name="archive">Archivia</string>
     <string name="unarchive">Disarchivia</string>
-    <string name="archiveList">Archivio</string>
-    <string name="noUnarchivedCardsMessage">Non esistono schede non archiviate</string>
     <string name="unarchived">Carta non archiviata</string>
     <string name="archived">Carta archiviata</string>
     <string name="settings_portrait_orientation">Verticale</string>
@@ -290,4 +280,9 @@
     <string name="settings_category_title_cards">Carte</string>
     <string name="settings_category_title_general">Generali</string>
     <string name="settings_category_title_privacy">Privacy</string>
+    <string name="app_copyright_short">Copyright © Sylvia van Os e contributori</string>
+    <string name="action_display_options">Opzioni di display</string>
+    <string name="show_archived_cards">Mostrare le carte archiviate</string>
+    <string name="view_online">Visualizzare online</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os e contributori</string>
 </resources>

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

@@ -19,7 +19,6 @@
     <string name="privacy_policy">プライバシーポリシー</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="chooseImportType">インポート元を選択</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> は有効な残高ではないようです。</string>
     <string name="points">ポイント</string>
     <string name="currency">通貨</string>
     <string name="balance">残高</string>
@@ -64,7 +63,6 @@
     <string name="starImage">お気に入りのスター</string>
     <string name="thumbnailDescription">サムネイル</string>
     <string name="copy_to_clipboard_toast">カード番号をクリップボードにコピーしました</string>
-    <string name="enterBarcodeInstructions">カード番号を入力し、バーコード形式を選択してください。</string>
     <string name="selectBarcodeTitle">バーコード選択</string>
     <string name="app_libraries">Libre third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
@@ -72,7 +70,6 @@
     <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_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</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="importOptionApplicationButton">外部のアプリを使う</string>
@@ -100,8 +97,6 @@
     <string name="importExport">インポート/エクスポート</string>
     <string name="failedParsingImportUriError">インポートURIを解析できません</string>
     <string name="noCardExistsError">カードが見つかりません</string>
-    <string name="noCardIdError">カード番号が入力されていません</string>
-    <string name="noStoreError">名前が入力されていません</string>
     <string name="noCardsMessage">カードを追加</string>
     <string name="cardShortcut">カードのショートカット</string>
     <string name="scanCardBarcode">バーコードをスキャン</string>
@@ -119,7 +114,6 @@
     <string name="unstar">お気に入りから削除</string>
     <string name="star">お気に入りに追加</string>
     <string name="noBarcode">バーコードなし</string>
-    <string name="barcodeNoBarcode">バーコードなし</string>
     <string name="barcodeType">バーコード形式</string>
     <string name="cardId">カード番号</string>
     <string name="note">メモ</string>
@@ -195,8 +189,6 @@
     <string name="and_data_usage">and data usage</string>
     <string name="group_updated">グループを更新しました</string>
     <string name="editGroup">グループ編集: <xliff:g>%s</xliff:g></string>
-    <string name="action_show_details">詳細を表示</string>
-    <string name="action_hide_details">詳細を非表示</string>
     <string name="selectColor">色を選択</string>
     <string name="setIcon">アイコン設定</string>
     <string name="group_edit">グループ編集</string>

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

@@ -12,7 +12,6 @@
     <string name="settings_system_theme">시스템</string>
     <string name="settings_theme">테마</string>
     <string name="settings">설정</string>
-    <string name="enterBarcodeInstructions">ID를 입력하고 아래에서 바코드 유형을 선택하거나 \"바코드가 없습니다\"를 선택하십시오.</string>
     <string name="selectBarcodeTitle">바코드 선택</string>
     <string name="about">정보</string>
     <string name="exporting">내보내는 중…</string>
@@ -28,7 +27,7 @@
     <string name="share">공유</string>
     <string name="copy_to_clipboard">ID를 클립보드에 복사</string>
     <string name="ok">OK</string>
-    <string name="confirm">확인하다</string>
+    <string name="confirm">확인</string>
     <string name="delete">삭제</string>
     <string name="edit">편집</string>
     <string name="save">저장</string>
@@ -36,7 +35,6 @@
     <string name="unstar">즐겨찾기에서 제거</string>
     <string name="star">즐겨찾기에 추가</string>
     <string name="noBarcode">바코드 없음</string>
-    <string name="barcodeNoBarcode">바코드가 없습니다</string>
     <string name="barcodeType">바코드 형식</string>
     <string name="cardId">카드 ID</string>
     <string name="note">노트</string>
@@ -55,43 +53,41 @@
     <string name="importFailed">가져오기를 수행할 수 없습니다</string>
     <string name="importFailedTitle">가져오기 실패</string>
     <string name="importSuccessfulTitle">가져오기 완료</string>
-    <string name="noCardIdError">ID를 입력하지 않았습니다</string>
     <string name="storeName">이름</string>
     <string name="thumbnailDescription">썸네일</string>
     <string name="importOptionApplicationButton">다른 앱 사용</string>
-    <string name="failedParsingImportUriError">가져온 URI를 분석할 수 없음</string>
-    <string name="noCardExistsError">해당 카드를 찾을 수 없습니다</string>
+    <string name="failedParsingImportUriError">가져올 URI를 분석할 수 없음</string>
+    <string name="noCardExistsError">해당 카드를 찾을 수 없음</string>
     <string name="moveUp">위로 이동</string>
     <string name="leaveWithoutSaveTitle">종료</string>
     <string name="moveDown">아래로 이동</string>
-    <string name="noStoreError">이름이 입력되지 않았습니다</string>
     <string name="starImage">즐겨찾기 별</string>
     <string name="settings_display_barcode_max_brightness">바코드를 표시할 때 화면 밝기 높이기</string>
     <string name="deleteConfirmation">정말 이 카드를 삭제하시겠습니까\?</string>
     <string name="deleteTitle">카드 삭제</string>
     <plurals name="deleteCardsTitle">
-        <item quantity="other">카드 <xliff:g>%d</xliff:g> 제거</item>
+        <item quantity="other">카드 <xliff:g>%d</xliff:g> 장 제거</item>
     </plurals>
     <string name="noGiftCardsGroup">카드를 몇 장 만든 다음 여기에서 그룹에 할당합니다.</string>
     <string name="noCardsMessage">먼저 카드 추가</string>
     <string name="leaveWithoutSaveConfirmation">저장하지 않고 나가시겠습니까\?</string>
-    <string name="intent_import_card_from_url_share_text">너의 카드를 공유하고 싶습니다</string>
+    <string name="intent_import_card_from_url_share_text">카드를 공유하고 싶습니다</string>
     <plurals name="groupCardCount">
         <item quantity="other"><xliff:g>%d</xliff:g> 카드</item>
     </plurals>
-    <string name="group_name_already_in_use">이미 사용 중인 그룹 이름</string>
+    <string name="group_name_already_in_use">그룹 이름 이미 사용 중</string>
     <string name="addFromImage">갤러리에서 이미지 선택</string>
     <string name="expiryStateSentenceExpired">만료: <xliff:g>%s</xliff:g></string>
     <string name="card">카드</string>
     <string name="editBarcode">바코드 편집</string>
     <string name="expiryDate">만료일</string>
     <string name="never">절대</string>
-    <string name="intent_import_card_from_url_share_multiple_text">나는 당신과 몇 가지 카드를 공유하고 싶습니다</string>
+    <string name="intent_import_card_from_url_share_multiple_text">당신과 카드를 공유하고 싶습니다</string>
     <string name="removeImage">이미지 삭제</string>
-    <string name="takePhoto">사진을 찍다</string>
-    <string name="yes">네</string>
+    <string name="takePhoto">사진 찍기</string>
+    <string name="yes">예</string>
     <string name="no">아니오</string>
-    <string name="failedGeneratingShareURL">공유 가능한 URL을 생성할 수 없습니다. 이를 신고해 주십시오.</string>
+    <string name="failedGeneratingShareURL">공유 가능한 URL을 생성할 수 없습니다. 이를 개발자에게 알려 주십시오.</string>
     <string name="turn_flashlight_off">손전등 끄기</string>
     <string name="settings_locale">언어</string>
     <string name="settings_system_locale">시스템</string>
@@ -102,7 +98,7 @@
     <string name="settings_magenta_theme">자홍색</string>
     <string name="settings_violet_theme">보라색</string>
     <string name="settings_blue_theme">파란색</string>
-    <string name="app_contributors">가능한 : <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="app_contributors">기여자: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="showMoreInfo">정보 보기</string>
     <string name="updateBalance">잔액 업데이트</string>
     <string name="failedToRetrieveImageFile">이미지 파일을 검색하지 못했습니다</string>
@@ -123,7 +119,6 @@
     <string name="unarchive">보관 취소</string>
     <string name="archived">보관된 카드</string>
     <string name="unarchived">보관되지 않은 카드</string>
-    <string name="archiveList">보관소</string>
     <string name="failedLaunchingPhotoPicker">지원되는 갤러리 앱을 찾을 수 없습니다</string>
     <string name="welcome">Catima 오신 것을 환영합니다</string>
     <string name="validFromDate">유효</string>
@@ -135,9 +130,9 @@
     <string name="switchToBarcode">바코드로 전환</string>
     <string name="donate">기부하다</string>
     <string name="show_name_below_image_thumbnail">이미지 축소판 아래에 이름 표시</string>
-    <string name="sort">종류</string>
+    <string name="sort">정렬</string>
     <string name="sort_by_most_recently_used">가장 최근에 사용됨</string>
-    <string name="settings_keep_screen_on">화면 켜기</string>
+    <string name="settings_keep_screen_on">화면 계속 켜기</string>
     <string name="unsupportedBarcodeType">이 바코드 유형은 아직 표시할 수 없습니다. 이후 버전의 앱에서 지원될 수 있습니다.</string>
     <string name="sort_by_expiry">만료</string>
     <string name="on_github">GitHub에서</string>
@@ -146,11 +141,10 @@
     <string name="translate_platform">Weblate에서</string>
     <string name="shortcutSelectCard">카드 선택</string>
     <string name="group_edit">그룹 편집</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> 이 유효한 잔액이 아닌 것 같습니다.</string>
     <string name="chooseImportType">데이터 가져오기</string>
     <string name="barcodeId">바코드 값</string>
     <string name="setBackImage">이미지 설정</string>
-    <string name="exportSuccessful">내보낸 데이터</string>
+    <string name="exportSuccessful">데이터 내보냄</string>
     <string name="settings_disable_lockscreen_while_viewing_card">화면 잠금 방지</string>
     <string name="group_updated">그룹 업데이트됨</string>
     <string name="moveBarcodeToTopOfScreen">바코드를 화면 상단으로 이동</string>
@@ -160,18 +154,17 @@
     <string name="setBarcodeHeight">바코드 높이 설정</string>
     <string name="setFrontImage">전면 이미지 설정</string>
     <plurals name="selectedCardCount">
-        <item quantity="other"><xliff:g>%d</xliff:g> 선택된</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> 선택됨</item>
     </plurals>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">저작권 © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
-    <string name="noCameraPermissionDirectToSystemSetting">바코드를 스캔하려면 Catima가 카메라에 액세스해야 합니다. 권한 설정을 변경하려면 여기를 탭하세요.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">저작권 © 2019–<xliff:g>%d</xliff:g> Sylvia van Os 및 기여자</string>
+    <string name="noCameraPermissionDirectToSystemSetting">바코드를 스캔하려면 Catima가 카메라에 접근해야 합니다. 권한 설정을 변경하려면 여기를 탭하세요.</string>
     <string name="exportOptionExplanation">데이터는 선택한 위치에 기록됩니다.</string>
-    <string name="app_license">GPL v3+에 따라 라이선스가 부여된 무료 소프트웨어</string>
+    <string name="app_license">GPL v3+로 라이선스된 카피레프트 자유 소프트웨어</string>
     <string name="failedOpeningFileManager">먼저 파일 관리자를 설치하십시오.</string>
-    <string name="importSuccessful">가져온 데이터</string>
+    <string name="importSuccessful">데이터 들여옴</string>
     <string name="group_name_is_empty">그룹 이름은 비워둘 수 없습니다</string>
     <string name="chooseExpiryDate">만료일 선택</string>
     <string name="settings_oled_dark">어두운 테마를 위한 검정색 배경</string>
-    <string name="action_show_details">세부정보 표시</string>
     <string name="noGroups">+ 더하기 버튼을 클릭하여 분류할 그룹을 추가합니다.</string>
     <string name="deleteConfirmationGroup">그룹을 삭제하시겠습니까\?</string>
     <string name="errorReadingImage">이미지를 읽을 수 없습니다</string>
@@ -182,24 +175,22 @@
     <string name="balanceSentence">잔액: <xliff:g>%s</xliff:g></string>
     <string name="noBarcodeFound">바코드를 찾을 수 없습니다</string>
     <string name="points">포인트</string>
-    <string name="balance">균형</string>
+    <string name="balance">잔액</string>
     <string name="currency">통화</string>
-    <string name="accept">수용하다</string>
+    <string name="accept">확인</string>
     <string name="importLoyaltyCardKeychain">로열티 카드 키체인에서 가져오기</string>
     <string name="wrongValueForBarcodeType">선택한 바코드 유형에 대해 값이 유효하지 않습니다</string>
     <string name="copy_to_clipboard_multiple_toast">클립보드에 복사된 ID</string>
-    <string name="updateBarcodeQuestionText">아이디를 변경하셨습니다. 동일한 값을 사용하도록 바코드도 업데이트하시겠습니까\?</string>
-    <string name="exportPasswordHint">암호를 입력</string>
+    <string name="updateBarcodeQuestionText">아이디를 변경하셨습니다. 바코드도 동일한 값을 사용하도록 업데이트하시겠습니까\?</string>
+    <string name="exportPasswordHint">암호 입력</string>
     <string name="updateBarcodeQuestionTitle">바코드 값을 업데이트하시겠습니까\?</string>
     <string name="turn_flashlight_on">손전등 켜기</string>
     <string name="exportPassword">내보내기를 보호하기 위한 암호 설정(선택 사항)</string>
     <string name="passwordRequired">비밀번호를 입력해주세요</string>
-    <string name="action_hide_details">상세정보 표시</string>
     <string name="setIcon">썸네일 설정</string>
     <string name="show_balance">잔액 표시</string>
     <string name="help_translate_this_app">이 앱을 번역하도록 도와주세요</string>
     <string name="duplicateCard">복제하다</string>
-    <string name="noUnarchivedCardsMessage">보관되지 않은 카드가 없습니다</string>
     <plurals name="groupCardCountWithArchived">
         <item quantity="other"><xliff:g>%1$d</xliff:g> 카드 (<xliff:g id="archivedCount">%2$d</xliff:g> 보관됨)</item>
     </plurals>
@@ -208,37 +199,37 @@
     <string name="show_validity">유효성 표시</string>
     <string name="icon_header_click_text">미리보기 이미지를 수정하려면 길게 누르세요</string>
     <plurals name="deleteCardsConfirmation">
-        <item quantity="other">이 <xliff:g>%d</xliff:g> 카드를 영구적으로 삭제하시겠습니까\?</item>
+        <item quantity="other">이 카드 <xliff:g>%d</xliff:g> 장을 영구적으로 삭제하시겠습니까\?</item>
     </plurals>
     <string name="card_ids_copied">복사된 ID</string>
     <string name="barcodeImageDescriptionWithType">이미지 <xliff:g>%s</xliff:g> 바코드</string>
     <string name="photos">사진</string>
     <string name="storageReadPermissionRequired">이 작업에 필요한 저장소를 읽을 수 있는 권한…</string>
-    <string name="app_libraries">Libre 타사 라이브러리: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_libraries">자유 타사 라이브러리: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="cameraPermissionRequired">이 작업에 필요한 카메라 액세스 권한…</string>
-    <string name="cameraPermissionDeniedTitle">카메라에 액세스할 수 없습니다</string>
+    <string name="cameraPermissionDeniedTitle">카메라 접근 실패</string>
     <string name="importOptionFilesystemButton">파일 시스템에서</string>
     <string name="app_copyright_old">Loyalty Card Keychain 기반
 \n저작권 © 2016–2020 Branden Archer</string>
-    <string name="app_resources">Libre 타사 리소스: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_resources">자유 타사 리소스: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="settings_lock_on_opening_orientation">카드를 열 때 사용되는 방향으로 고정</string>
     <string name="editGroup">그룹 편집: <xliff:g>%s</xliff:g></string>
-    <string name="frontImageDescription">전면 이미지</string>
-    <string name="backImageDescription">뒷면 이미지</string>
+    <string name="frontImageDescription">전면 사진</string>
+    <string name="backImageDescription">후면 사진</string>
     <string name="currentBalanceSentence">현재 잔액: <xliff:g>%s</xliff:g></string>
     <string name="importCards">카드 가져오기</string>
     <string name="updateBalanceTitle">얼마를 썼습니까\?</string>
     <string name="newBalanceSentence">새 잔액: <xliff:g>%s</xliff:g></string>
     <string name="settings_card_orientation">바코드 방향</string>
-    <string name="settings_follow_system_orientation">시스템을 따르세요</string>
-    <string name="settings_portrait_orientation">초상화</string>
-    <string name="settings_landscape_orientation">풍경</string>
+    <string name="settings_follow_system_orientation">기기 설정 따르기</string>
+    <string name="settings_portrait_orientation">세로</string>
+    <string name="settings_landscape_orientation">가로</string>
     <string name="noGroupCards">이 그룹은 비어 있습니다</string>
     <string name="app_loyalty_card_keychain">로열티 카드 키체인</string>
     <string name="privacy_policy">개인 정보 정책</string>
     <string name="privacy_policy_popup_text">개인 정보 보호 정책 공지(일부 앱 스토어에서 필요):
 \n
-\n데이터가 전혀 수집되지 않습니다. 우리 앱은 무료 소프트웨어이기 때문에 누구나 확인할 수 있습니다.</string>
+\n아무런 데이터도 수집하지 않습니다. 우리 앱은 자유 소프트웨어이기 때문에 누구나 이를 확인할 수 있습니다.</string>
     <string name="importCatima">Catima에서 가져오기</string>
     <string name="importCatimaMessage">가져올 Catima에서 <i>catima.zip</i> 내보내기를 선택합니다.
 \n먼저 내보내기를 눌러 다른 Catima 앱의 가져오기/내보내기 메뉴에서 생성합니다.</string>
@@ -251,7 +242,7 @@
     <string name="importStocard">Stocard에서 가져오기</string>
     <string name="importStocardMessage">가져올 Stocard에서 <i>***.zip</i> 내보내기를 선택합니다.
 \nsupport@stocardapp.com으로 이메일을 보내 데이터 내보내기를 요청하면 받을 수 있습니다.</string>
-    <string name="importVoucherVault">바우처 보관소에서 가져오기</string>
+    <string name="importVoucherVault">Voucher Vault에서 가져오기</string>
     <string name="importVoucherVaultMessage">가져올 Voucher Vault에서 <i>vouchervault.json</i> 내보내기를 선택합니다.
 \n먼저 바우처 금고에서 내보내기를 눌러 생성하세요.</string>
     <string name="sameAsCardId">아이디와 동일</string>
@@ -265,4 +256,19 @@
     <string name="previousCard">이전의</string>
     <string name="nextCard">다음</string>
     <string name="failedToOpenUrl">먼저 웹 브라우저를 설치하십시오</string>
-</resources>
+    <string name="settings_disable_lockscreen_while_viewing_card_summary">카드가 보일 때 화면 잠금 방지</string>
+    <string name="permissionReadCardsDescription">저장된 카드와 노트, 사진을 포함한 모든 세부 정보 읽기</string>
+    <string name="settings_oled_dark_summary">OLED 화면에서의 배터리 사용량 줄임</string>
+    <string name="app_copyright_short">저작권 © Sylvia van Os 및 기여자</string>
+    <string name="settings_allow_content_provider_read_summary">접근을 위해서는 해당 앱에서 별도로 권한 요청을 해야 합니다</string>
+    <string name="settings_allow_content_provider_read_title">다른 앱의 내 정보 접근 허용</string>
+    <string name="permissionReadCardsLabel">Catima 카드 읽기</string>
+    <string name="settings_keep_screen_on_summary">카드가 보일 때 화면 꺼짐 방지</string>
+    <string name="view_online">온라인에서 보기</string>
+    <string name="settings_category_title_general">일반</string>
+    <string name="action_display_options">디스플레이 옵션</string>
+    <string name="settings_display_barcode_max_brightness_summary">스캐너가 작동하는 데 필요합니다</string>
+    <string name="settings_category_title_cards">카드</string>
+    <string name="show_archived_cards">보관된 카드 표시</string>
+    <string name="settings_category_title_privacy">프라이버시</string>
+</resources>

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

@@ -46,7 +46,6 @@
     <string name="exportPasswordHint">Passwuert aginn</string>
     <string name="noMatchingGiftCards">Ech hunn näischt fonnt. Probéieren Iech, Är Sich ze änneren.</string>
     <string name="note">Beuechten</string>
-    <string name="barcodeNoBarcode">Dës Kaart huet kee Barcode</string>
     <string name="importExportHelp">Wann Dir Är Kaarten sécheren, kënnen Si se op een anert Instrument réckelen.</string>
     <string name="about">Iwwer</string>
     <string name="selectBarcodeTitle">Wielt Barcode</string>
@@ -63,7 +62,6 @@
     <string name="importOptionApplicationExplanation">Benotzen Se eng beliebige App oder Hire bevorzugten Dateimanager, fir eng Datei ze opmaachen.</string>
     <string name="accept">Averstane</string>
     <string name="settings_display_barcode_max_brightness">Erhellen barcode-Usiicht</string>
-    <string name="enterBarcodeInstructions">Gitt d \' Kaarten-ID en an wielen Se entweder den Barcode-Typ ënnen oder \"Dës Kaart huet kee Barcode\".</string>
     <string name="importStocard">Importéieren vun Stocard</string>
     <string name="importLoyaltyCardKeychain">Import vun Loyalty Card Keychain</string>
     <string name="setBarcodeId">Leeë Si barcode-Wäert</string>

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

@@ -15,8 +15,6 @@
     <string name="editCardTitle">Redaguoti lojalumo kortelę</string>
     <string name="addCardTitle">Pridėti lojalumo kortelę</string>
     <string name="scanCardBarcode">Nuskaityti brūkšninį kodą</string>
-    <string name="noStoreError">Neįvestas pavadinimas</string>
-    <string name="noCardIdError">Neįvestas ID</string>
     <string name="importExport">Importuoti/Exportuoti</string>
     <string name="exportName">Exportuoti</string>
     <string name="importFailed">Nepavyko importuoti</string>
@@ -35,7 +33,6 @@
     <string name="unstar">Pašalinti iš mėgstamiausių</string>
     <string name="star">Pridėti prie mėgstamiausių</string>
     <string name="noBarcode">Nėra brūkšninio kodo</string>
-    <string name="barcodeNoBarcode">Brūkšninio kodo nėra</string>
     <string name="barcodeType">Brūkšninio kodo tipas</string>
     <string name="noMatchingGiftCards">Rezultatų nėra. Pabandykite pakeisti paiešką.</string>
     <string name="action_search">Ieškoti</string>
@@ -47,7 +44,6 @@
 \nSukurkite jį iš Loyalty Card Keychain meniu Importavimas/Eksportavimas, pirmiausia paspausdami Eksportuoti.</string>
     <string name="importLoyaltyCardKeychain">Importuoti iš Loyalty Card Keychain</string>
     <string name="app_loyalty_card_keychain">Lojalumo kortelės</string>
-    <string name="parsingBalanceFailed">Panašu, kad <xliff:g> %s </xliff:g> reikšmė nėra tinkama.</string>
     <string name="moveBarcodeToTopOfScreen">Perkelti brūkšninį kodą į ekrano viršų</string>
     <string name="settings_display_barcode_max_brightness">Šviesinti brūkšninio kodo rodinį</string>
     <string name="failedParsingImportUriError">Nepavyko iššifruoti importo URI</string>
@@ -131,7 +127,6 @@
     <string name="settings">Nustatymai</string>
     <string name="starImage">Mėgstamiausia žvaigždė</string>
     <string name="thumbnailDescription">Miniatiūra</string>
-    <string name="enterBarcodeInstructions">Įveskite ID ir toliau pasirinkite brūkšninio kodo tipą arba \"Nėra brūkšninio kodo\".</string>
     <string name="app_resources">Laisvosios trečiųjų šalių ištekliai: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Laisvosios trečiųjų šalių bibliotekos: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_copyright_old">Paremta Loyalty Card Keychain
@@ -209,11 +204,7 @@
     <string name="noGiftCardsGroup">Sukurkite keletą kortelių ir priskirkite jas grupei čia.</string>
     <string name="setIcon">Nustatyti piktogramą</string>
     <string name="selectColor">Pasirinkti spalvą</string>
-    <string name="action_hide_details">Paslėpti informaciją</string>
-    <string name="action_show_details">Rodyti išsamią informaciją</string>
     <string name="settings_card_orientation">Brūkšninio kodo orientacija</string>
-    <string name="archiveList">Archyvas</string>
-    <string name="noUnarchivedCardsMessage">Nėra išarchyvuotų kortelių</string>
     <string name="failedLaunchingPhotoPicker">Nepavyko rasti palaikomos galerijos programėlės</string>
     <string name="previousCard">Ankstesnė</string>
     <string name="nextCard">Kita</string>

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

@@ -7,7 +7,6 @@
     <string name="storeName">Nosaukums</string>
     <string name="note">Piezīme</string>
     <string name="barcodeType">Svītrkoda tips</string>
-    <string name="barcodeNoBarcode">Bez svītrkoda</string>
     <string name="noBarcode">Nav svītrkoda</string>
     <string name="star">Pievienot izlasei</string>
     <string name="unstar">Noņemt no izlases</string>
@@ -33,7 +32,6 @@
     <string name="scanCardBarcode">Skenēt svītrkodu</string>
     <string name="cardShortcut">Kartes saīsne</string>
     <string name="noCardsMessage">Vispirms pievienojiet karti</string>
-    <string name="noStoreError">Vārds nav ievadīts</string>
     <string name="noCardExistsError">Nevarēja atrast karti</string>
     <string name="failedParsingImportUriError">Nevarēja parsēt importa URI</string>
     <string name="importExport">Imports/Eksports</string>
@@ -96,17 +94,13 @@
     <string name="translate_platform">vietnē Weblate</string>
     <string name="starred">Izlase</string>
     <string name="cardId">Kartes numurs</string>
-    <string name="enterBarcodeInstructions">Ievadiet kartes numuru un izvēlieties svītrkoda tipu (vai izvēlieties \"bez svītrkoda\").</string>
     <plurals name="deleteCardsConfirmation">
         <item quantity="zero">Neatgriezeniski dzēst šīs <xliff:g>%d</xliff:g> kartes\?</item>
         <item quantity="one">Neatgriezeniski dzēst šo <xliff:g>%d</xliff:g> karti\?</item>
         <item quantity="other">Neatgriezeniski dzēst šīs <xliff:g>%d</xliff:g> kartes\?</item>
     </plurals>
-    <string name="noCardIdError">Numurs nav ievadīts</string>
     <string name="about_title_fmt">Par <xliff:g id="app_name">%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Derīguma termiņš beidzās: <xliff:g>%s</xliff:g></string>
-    <string name="action_hide_details">Slēpt detaļas</string>
-    <string name="action_show_details">Rādīt detalizēti</string>
     <string name="selectColor">Izvēlieties krāsu</string>
     <string name="settings_catima_theme">Catima</string>
     <string name="settings_pink_theme">Rozā</string>
@@ -121,7 +115,6 @@
         <item quantity="one"><xliff:g>%s</xliff:g> punkts</item>
         <item quantity="other"><xliff:g>%s</xliff:g> punkti</item>
     </plurals>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> nešķiet derīga bilance.</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="privacy_policy_popup_text">Paziņojums par privātuma politiku (nepieciešams dažiem lietotņu veikaliem):
 \n
@@ -230,8 +223,6 @@
     <string name="unarchive">Atarhivēt</string>
     <string name="archived">Karte arhivēta</string>
     <string name="unarchived">Karte atarhivēta</string>
-    <string name="archiveList">Arhīvs</string>
-    <string name="noUnarchivedCardsMessage">Nav atarhivētu karšu</string>
     <string name="failedLaunchingPhotoPicker">Nevarēja atrast atbalstītu galerijas lietotni</string>
     <string name="previousCard">Iepriekšējā</string>
     <string name="nextCard">Nākamā</string>

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

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

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

@@ -19,8 +19,6 @@
     <string name="scanCardBarcode">Skann strekkoden</string>
     <string name="cardShortcut">Kort-snarvei</string>
     <string name="noCardsMessage">Legg til et kort først</string>
-    <string name="noStoreError">Navn ikke angitt</string>
-    <string name="noCardIdError">Ingen ID innskrevet</string>
     <string name="noCardExistsError">Fant ikke det kortet</string>
     <string name="importExport">Importer/eksporter</string>
     <string name="exportName">Eksporter</string>
@@ -45,7 +43,6 @@
     <string name="about_title_fmt">Om <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versjon: <xliff:g id="version">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Velg strekkode</string>
-    <string name="enterBarcodeInstructions">Skriv inn kortets ID, og enten velg strekkodetypen nedenfor, eller «Det er ingen strekkode».</string>
     <string name="copy_to_clipboard_toast">ID kopiert til utklippstavle</string>
     <string name="thumbnailDescription">Miniatyrbilde</string>
     <string name="settings">Innstillinger</string>
@@ -61,7 +58,6 @@
 \nopphavsrett 2016–2020 Branden Archer</string>
     <string name="failedParsingImportUriError">Kunne ikke tolke importerings-URI</string>
     <string name="share">Del</string>
-    <string name="barcodeNoBarcode">Det er ingen strekkode</string>
     <string name="noMatchingGiftCards">Ingen resultater. Prøv å endre søket.</string>
     <string name="action_search">Søk</string>
     <string name="starImage">Favorittstjerne</string>
@@ -92,7 +88,6 @@
     <string name="expiryDate">Utløpsdato</string>
     <string name="expiryStateSentenceExpired">Utløpt: <xliff:g>%s</xliff:g></string>
     <string name="moveBarcodeToTopOfScreen">Flytt strekkoden til toppen av skjermen</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> ser ikke ut til å være en gyldig saldo.</string>
     <string name="points">Poeng</string>
     <string name="currency">Valuta</string>
     <string name="balance">Saldo</string>
@@ -129,7 +124,7 @@
     <string name="app_resources">Frie tredjepartsressurser: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Frie tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="card_ids_copied">Kopierte ID(er)</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Opphavsrett © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Opphavsrett © 2019–<xliff:g>%d</xliff:g> Sylvia van Os og bidragsytere</string>
     <string name="updateBarcodeQuestionText">Du har endret ID-en. Ønsker du å også oppdatere strekkoden til samme verdi\?</string>
     <string name="no">Nei</string>
     <string name="yes">Ja</string>
@@ -203,8 +198,6 @@
     <string name="group_name_is_empty">Gruppenavn kan ikke være tomt</string>
     <string name="editGroup">Redigerer gruppe: <xliff:g>%s</xliff:g></string>
     <string name="noGiftCardsGroup">Lag noen kort, og legg dem til i en gruppe her.</string>
-    <string name="action_show_details">Vis detaljer</string>
-    <string name="action_hide_details">Skjul detaljer</string>
     <string name="selectColor">Velg farge</string>
     <string name="setIcon">Sett miniatyrbilde</string>
     <string name="shortcutSelectCard">velg et kort</string>
@@ -226,8 +219,6 @@
     <string name="unarchive">Opphev arkivering</string>
     <string name="archived">Kort arkivert</string>
     <string name="unarchived">Kort flyttet tilbake fra arkiv</string>
-    <string name="noUnarchivedCardsMessage">Ingen kort flyttet tilbake fra arkiv finnes</string>
-    <string name="archiveList">Arkiv</string>
     <string name="settings_follow_system_orientation">Følg systemet</string>
     <string name="settings_portrait_orientation">Stående</string>
     <string name="failedLaunchingPhotoPicker">Fant ikke noe støttet galleriprogram</string>
@@ -283,4 +274,8 @@
     <string name="settings_category_title_general">Generelt</string>
     <string name="settings_category_title_privacy">Personvern</string>
     <string name="settings_oled_dark_summary">Reduserer batteribruk for OLED-skjermer</string>
+    <string name="action_display_options">Visningsalternativer</string>
+    <string name="show_archived_cards">Vis arkiverte kort</string>
+    <string name="view_online">Vis på nett</string>
+    <string name="app_copyright_short">Opphavsrett © Sylvia van Os og bidragsytere</string>
 </resources>

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

@@ -8,7 +8,6 @@
     <string name="note">Aantekening</string>
     <string name="cardId">Kaartnummer</string>
     <string name="barcodeType">Soort barcode</string>
-    <string name="barcodeNoBarcode">Er is geen barcode</string>
     <string name="cancel">Annuleren</string>
     <string name="save">Opslaan</string>
     <string name="edit">Bewerken</string>
@@ -23,8 +22,6 @@
     <string name="scanCardBarcode">Barcode scannen</string>
     <string name="cardShortcut">Kaartsnelkoppeling</string>
     <string name="noCardsMessage">Voeg eerst een kaart toe</string>
-    <string name="noStoreError">Geen naam ingevoerd</string>
-    <string name="noCardIdError">Geen id ingevoerd</string>
     <string name="noCardExistsError">De kaart is niet aangetroffen</string>
     <string name="failedParsingImportUriError">Kan de import-uri niet verwerken</string>
     <string name="importExport">Importeren/Exporteren</string>
@@ -50,7 +47,6 @@
     <string name="about_title_fmt">Over <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versie: <xliff:g id="version">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Barcode toevoegen</string>
-    <string name="enterBarcodeInstructions">Voer de kaart-id in en kies daarna het soort barcode of druk op “Deze kaart heeft geen barcode”.</string>
     <string name="copy_to_clipboard_toast">De kaart-id is gekopieerd naar het klembord</string>
     <string name="thumbnailDescription">Miniatuurvoorbeeld</string>
     <string name="settings">Instellingen</string>
@@ -92,7 +88,6 @@
     <string name="expiryStateSentence">Vervalt op <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Verlopen: <xliff:g>%s</xliff:g></string>
     <string name="moveBarcodeToTopOfScreen">Barcode verplaatsen naar bovenkant van scherm</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> lijkt geen geldig saldo te zijn.</string>
     <string name="points">Aantal punten</string>
     <string name="currency">Valuta</string>
     <string name="balance">Saldo</string>
@@ -128,7 +123,7 @@
     <string name="wrongValueForBarcodeType">Deze waarde komt niet overeen met het gekozen barcodetype</string>
     <string name="app_resources">Vrije externe bronnen: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Vrije externe bibliotheken: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Auteursrecht © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Auteursrecht © 2019–<xliff:g>%d</xliff:g> Sylvia van Os en bijdragers</string>
     <string name="intent_import_card_from_url_share_multiple_text">Ik wil kaarten met je delen</string>
     <string name="copy_to_clipboard_multiple_toast">De kaart-id\'s zijn gekopieerd naar het klembord</string>
     <string name="card_ids_copied">De kaart-id‘s zijn gekopieerd</string>
@@ -205,8 +200,6 @@
     <string name="group_edit">Groep bewerken</string>
     <string name="setIcon">Miniatuur instellen</string>
     <string name="selectColor">Kies een kleur</string>
-    <string name="action_show_details">Details tonen</string>
-    <string name="action_hide_details">Details verbergen</string>
     <string name="translate_platform">op Weblate</string>
     <string name="shortcutSelectCard">Kies een kaart</string>
     <string name="options">Opties</string>
@@ -227,9 +220,7 @@
     <string name="unarchive">Dearchiveren</string>
     <string name="archived">De kaart is gearchiveerd</string>
     <string name="unarchived">De kaart is gedearchiveerd</string>
-    <string name="archiveList">Archief</string>
     <string name="settings_landscape_orientation">Horizontaal</string>
-    <string name="noUnarchivedCardsMessage">Er zijn geen gedearchiveerde kaarten</string>
     <string name="failedLaunchingPhotoPicker">Er is geen ondersteunde galerij-app aangetroffen</string>
     <plurals name="groupCardCountWithArchived">
         <item quantity="one"><xliff:g>%1$d</xliff:g> kaart (<xliff:g id="archivedCount">%2$d</xliff:g> gearchiveerd)</item>
@@ -274,7 +265,7 @@
     <string name="show_validity">Geldigheid tonen</string>
     <string name="permissionReadCardsLabel">Catimakaarten uitlezen</string>
     <string name="settings_allow_content_provider_read_summary">Let op: apps moeten nog steeds om toestemming vragen</string>
-    <string name="permissionReadCardsDescription">Lees alle kaarten uit, inclusief alle details, aantekeningen en afbeeldingen</string>
+    <string name="permissionReadCardsDescription">Lees alle Catima-kaarten uit, inclusief alle details, aantekeningen en afbeeldingen</string>
     <string name="settings_allow_content_provider_read_title">Andere apps toegang geven tot gegevens</string>
     <string name="settings_keep_screen_on_summary">Laat het scherm niet op zwart gaan tijdens het bekijken van een kaart</string>
     <string name="settings_category_title_privacy">Privacy</string>
@@ -283,4 +274,8 @@
     <string name="settings_oled_dark_summary">Verlaagt het accuverbruik op oledschermen</string>
     <string name="settings_category_title_cards">Kaarten</string>
     <string name="settings_category_title_general">Algemeen</string>
+    <string name="app_copyright_short">Auteursrecht © Sylvia van Os en bijdragers</string>
+    <string name="action_display_options">Weergave-instellingen</string>
+    <string name="view_online">Online bekijken</string>
+    <string name="show_archived_cards">Gearchiveerde kaarten tonen</string>
 </resources>

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

@@ -12,8 +12,6 @@
     <string name="importExport">Importar/Exportar</string>
     <string name="failedParsingImportUriError">Analisi impossibla l’URI d’importacion</string>
     <string name="noCardExistsError">Impossible de trobar aquesta carta</string>
-    <string name="noCardIdError">Cap d’identificant pas picat</string>
-    <string name="noStoreError">Cap de nom pas picat</string>
     <string name="card_ids_copied">ID copiat(s)</string>
     <string name="noCardsMessage">Apondètz d’en primièr una carta</string>
     <string name="cardShortcut">Acorchi de carta</string>
@@ -43,7 +41,6 @@
     </plurals>
     <string name="deleteTitle">Suprimir la carta</string>
     <string name="noBarcode">Cap de còdi de barras</string>
-    <string name="barcodeNoBarcode">Cap de còdi de barras</string>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> seleccionada</item>
         <item quantity="other"><xliff:g>%d</xliff:g> seleccionadas</item>

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

@@ -7,7 +7,6 @@
     <string name="storeName">Nazwa</string>
     <string name="note">Notatka</string>
     <string name="cardId">Identyfikator karty</string>
-    <string name="barcodeNoBarcode">Bez kodu kreskowego</string>
     <string name="cancel">Anuluj</string>
     <string name="save">Zapisz</string>
     <string name="edit">Edytuj</string>
@@ -22,8 +21,6 @@
     <string name="scanCardBarcode">Zeskanuj kod kreskowy</string>
     <string name="cardShortcut">Skrót karty</string>
     <string name="noCardsMessage">Najpierw dodaj kartę</string>
-    <string name="noStoreError">Nie wprowadzono nazwy</string>
-    <string name="noCardIdError">Nie wprowadzono identyfikatora</string>
     <string name="noCardExistsError">Nie można znaleźć tej karty lojalnościowej</string>
     <string name="failedParsingImportUriError">Nie można przeanalizować identyfikatora importu URI</string>
     <string name="importExport">Importuj/Eksportuj</string>
@@ -48,7 +45,6 @@
     <string name="about_title_fmt">O <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Wersja: <xliff:g id="version">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Wybierz kod kreskowy</string>
-    <string name="enterBarcodeInstructions">Wprowadź ID, a następnie wybierz typ kodu kreskowego, którego chcesz użyć lub wybierz „Bez kodu kreskowego”.</string>
     <string name="copy_to_clipboard_toast">Skopiowano ID do schowka</string>
     <string name="thumbnailDescription">Miniaturka</string>
     <string name="settings">Ustawienia</string>
@@ -132,7 +128,6 @@
     <string name="privacy_policy">Polityka prywatności</string>
     <string name="app_loyalty_card_keychain">Brelok dla twoich kart lojalnościowych</string>
     <string name="chooseImportType">Importuj dane z</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> nie wydaje się być prawidłową wartością.</string>
     <string name="points">Punkty</string>
     <string name="currency">Waluta</string>
     <string name="balance">Saldo</string>
@@ -166,7 +161,7 @@
     <string name="settings_keep_screen_on">Nie wygaszaj ekranu</string>
     <string name="app_resources">Otwarte zewnętrzne zasoby: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Otwarte zewnętrzne biblioteki: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Wszelkie prawa zastrzeżone © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Wszelkie prawa zastrzeżone © 2019–<xliff:g>%d</xliff:g> Sylvia van Os i współtwórcy</string>
     <string name="card_ids_copied">Skopiowano identyfikator(y)</string>
     <plurals name="deleteCardsConfirmation">
         <item quantity="one">Usunąć tą <xliff:g>%d</xliff:g> kartę permamentnie\?</item>
@@ -187,8 +182,6 @@
         <item quantity="other"><xliff:g>%d</xliff:g> zaznaczonych</item>
     </plurals>
     <string name="shortcutSelectCard">Wybierz kartę</string>
-    <string name="action_show_details">Pokaż szczegóły</string>
-    <string name="action_hide_details">Ukryj szczegóły</string>
     <string name="sort_by_name">Nazwa</string>
     <string name="sort_by_most_recently_used">Ostatnio używane</string>
     <string name="sort_by_expiry">Data wygaśnięcia</string>
@@ -238,8 +231,6 @@
     <string name="unarchive">Cofnij archiwizację</string>
     <string name="archived">Karta zarchiwizowana</string>
     <string name="unarchived">Karta niezarchiwizowana</string>
-    <string name="archiveList">Archiwum</string>
-    <string name="noUnarchivedCardsMessage">Nie istnieją żadne niezarchiwizowane karty</string>
     <string name="failedLaunchingPhotoPicker">Nie można odnaleźć aplikacji galeria</string>
     <string name="previousCard">Poprzedni</string>
     <string name="nextCard">Następny</string>
@@ -297,4 +288,8 @@
     <string name="settings_category_title_cards">Karty</string>
     <string name="settings_category_title_general">Ogólne</string>
     <string name="settings_category_title_privacy">Prywatność</string>
+    <string name="app_copyright_short">Wszelkie prawa zastrzeżone © Sylvia van Os i współtwórcy</string>
+    <string name="action_display_options">Opcje wyświetlania</string>
+    <string name="show_archived_cards">Pokaż zarchiwizowane karty</string>
+    <string name="view_online">Zobacz online</string>
 </resources>

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

@@ -8,7 +8,6 @@
     <string name="storeName">Nome</string>
     <string name="note">Nota</string>
     <string name="barcodeType">Tipo de código de barras</string>
-    <string name="barcodeNoBarcode">Não há código de barras</string>
     <string name="cancel">Cancelar</string>
     <string name="save">Guardar</string>
     <string name="edit">Editar</string>
@@ -39,7 +38,6 @@
     <string name="cardId">Identificador do cartão</string>
     <string name="cardShortcut">Atalho do cartão</string>
     <string name="noCardsMessage">Adicione primeiro um cartão</string>
-    <string name="noStoreError">Nenhum nome inserido</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="importExport">Importar / exportar</string>
@@ -62,7 +60,6 @@
     <string name="settings_light_theme">Claro</string>
     <string name="settings_dark_theme">Escuro</string>
     <string name="selectBarcodeTitle">Selecionar código de barras</string>
-    <string name="enterBarcodeInstructions">Introduza o identificador e depois escolha o tipo de código de barras abaixo ou \"Sem código de barras\".</string>
     <string name="copy_to_clipboard_toast">Identificador copiado para a área de transferência</string>
     <string name="thumbnailDescription">Miniatura</string>
     <string name="starImage">Favorito</string>
@@ -137,7 +134,6 @@
     <string name="balance">Saldo</string>
     <string name="currency">Moeda</string>
     <string name="points">Pontos</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> não parece ser um saldo válido.</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="privacy_policy">Política de privacidade</string>
     <string name="privacy_policy_popup_text">Aviso de política de privacidade (exigido por algumas lojas de aplicações):
@@ -187,7 +183,6 @@
     <string name="rate_this_app">Avalie esta aplicação</string>
     <string name="on_google_play">no Google Play</string>
     <string name="exportOptionExplanation">Os dados serão guardados num local à sua escolha.</string>
-    <string name="noCardIdError">Nenhum identificador inserido</string>
     <plurals name="deleteCardsTitle">
         <item quantity="one">Eliminar <xliff:g>%d</xliff:g> cartão</item>
         <item quantity="many">Eliminar <xliff:g>%d</xliff:g> cartões</item>
@@ -209,8 +204,6 @@
     <string name="noGiftCardsGroup">Crie alguns cartões e atribua-os depois ao grupo aqui.</string>
     <string name="selectColor">Selecionar cor</string>
     <string name="setIcon">Definir miniatura</string>
-    <string name="action_show_details">Mostrar detalhes</string>
-    <string name="action_hide_details">Ocultar detalhes</string>
     <string name="shortcutSelectCard">Selecione um cartão</string>
     <string name="translate_platform">no Weblate</string>
     <string name="starred">Estrela</string>
@@ -233,8 +226,6 @@
     <string name="unarchive">Desarquivar</string>
     <string name="archived">Cartão arquivado</string>
     <string name="unarchived">Cartão desarquivado</string>
-    <string name="archiveList">Arquivar</string>
-    <string name="noUnarchivedCardsMessage">Não existem cartões desarquivados</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>
@@ -277,7 +268,7 @@
     <string name="show_validity">Mostrar validade</string>
     <string name="show_balance">Mostrar saldo</string>
     <string name="permissionReadCardsLabel">Ler Cartas Catima</string>
-    <string name="permissionReadCardsDescription">Leia seus cartões e todos os seus detalhes, incluindo notas e imagens</string>
+    <string name="permissionReadCardsDescription">leia seus cartões do Catima e todos os seus detalhes, incluindo notas e imagens</string>
     <string name="show_note">Mostrar nota</string>
     <string name="show_name_below_image_thumbnail">Mostrar nome abaixo da miniatura do ícone</string>
     <string name="settings_disable_lockscreen_while_viewing_card_summary">Desativa o bloqueio de tela ao visualizar um cartão</string>

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="barcodeType">Tip cod de bare</string>
     <string name="cardId">Cardului ID</string>
     <string name="note">Notă</string>
     <string name="storeName">Numele</string>
     <string name="noMatchingGiftCards">Nu au fost găsite rezultate. Încercați să schimbați termenii de căutare.</string>
-    <string name="noGiftCards">Faceți clic pe butonul + plus pentru a adăuga o carte sau importați mai întâi câteva din meniul ⋮.</string>
+    <string name="noGiftCards">Faceți clic pe butonul + plus pentru a adăuga o carte sau importați mai întâi una din meniul ⋮.</string>
     <string name="action_add">Adăugați</string>
     <string name="action_search">Căutare</string>
     <string name="sendLabel">Trimiteți…</string>
@@ -21,7 +21,6 @@
     <string name="unstar">Eliminați din favorite</string>
     <string name="star">Adaugă la favorite</string>
     <string name="noBarcode">Fără cod de bare</string>
-    <string name="barcodeNoBarcode">Nu există cod de bare</string>
     <string name="moveDown">Mutarea în jos</string>
     <string name="card">Cardul</string>
     <string name="settings_theme">Tema</string>
@@ -33,9 +32,8 @@
     <string name="exportName">Exportați</string>
     <string name="importSuccessfulTitle">Importat</string>
     <string name="importFailedTitle">Importul a eșuat</string>
-    <string name="importFailed">Nu s-a putut importa carduri</string>
-    <string name="noCardIdError">Nu s-a introdus niciun ID de card</string>
-    <string name="exportFailed">Nu s-a putut exporta carduri</string>
+    <string name="importFailed">Nu s-a putut efectua importarea</string>
+    <string name="exportFailed">Nu s-a putut efectua exportarea</string>
     <string name="importing">Importul…</string>
     <string name="exporting">Exportul…</string>
     <string name="exportOptionExplanation">Datele vor fi scrise într-o locație aleasă de dumneavoastră.</string>
@@ -51,7 +49,6 @@
     <string name="importOptionApplicationExplanation">Utilizați orice aplicație sau managerul de fișiere preferat pentru a deschide un fișier.</string>
     <string name="about">Despre</string>
     <string name="app_license">Software liber cu copyleft, licențiat GPLv3+</string>
-    <string name="enterBarcodeInstructions">Introduceți ID-ul cardului și alegeți fie tipul de cod de bare de mai jos, fie \"Acest card nu are cod de bare\".</string>
     <string name="settings_system_theme">Sistemul</string>
     <string name="settings_light_theme">Lumină</string>
     <string name="settings_dark_theme">Întuneric</string>
@@ -71,7 +68,6 @@
     <string name="editBarcode">Editarea codului de bare</string>
     <string name="chooseExpiryDate">Alegeți data de expirare</string>
     <string name="copy_to_clipboard_toast">ID-ul cardului copiat în clipboard</string>
-    <string name="noStoreError">Nici un nume introdus</string>
     <string name="selectBarcodeTitle">Selectare cod de bare</string>
     <string name="noGroupCards">Acest grup nu conține nicio carte</string>
     <string name="addFromImage">Selectați imaginea din galerie</string>
@@ -94,7 +90,6 @@
     <string name="yes">Da</string>
     <string name="no">Nu</string>
     <string name="archive">Arhivați</string>
-    <string name="archiveList">Arhivă</string>
     <string name="passwordRequired">Vă rugăm, introduceți parola</string>
     <string name="unsupportedBarcodeType">Acest tip de cod de bare nu poate fi afișat. Este posibil ca acesta să se poată afișa într-o versiune mai nouă a aplicației.</string>
     <string name="photos">Imagini</string>
@@ -102,4 +97,5 @@
     <string name="importCatima">Importați din Catima</string>
     <string name="importStocard">Importați din Stocard</string>
     <string name="intent_import_card_from_url_share_multiple_text">Aș dori să partajez niște carduri cu tine</string>
-</resources>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Drepturi de autor © 2019–<xliff:g>%d</xliff:g> Sylvia van Os și contribuitorii</string>
+</resources>

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

@@ -8,7 +8,6 @@
     <string name="note">Примечание</string>
     <string name="cardId">Номер карты</string>
     <string name="barcodeType">Тип штрих-кода</string>
-    <string name="barcodeNoBarcode">Нет штрих-кода</string>
     <string name="cancel">Отмена</string>
     <string name="save">Сохранить</string>
     <string name="edit">Изменить</string>
@@ -23,8 +22,6 @@
     <string name="scanCardBarcode">Отсканируйте штрих-код</string>
     <string name="cardShortcut">Ярлык карты</string>
     <string name="noCardsMessage">Сначала добавьте карту</string>
-    <string name="noStoreError">Название не указано</string>
-    <string name="noCardIdError">Номер не указан</string>
     <string name="noCardExistsError">Карта не найдена</string>
     <string name="failedParsingImportUriError">Невозможно разобрать импортируемый URI</string>
     <string name="importExport">Импорт/Экспорт</string>
@@ -50,7 +47,6 @@
     <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">Выбор штрих-кода</string>
-    <string name="enterBarcodeInstructions">Введите номер и выберите тип штрих-кода (или выберите \"Нет штрих-кода\").</string>
     <string name="copy_to_clipboard_toast">Номер скопирован в буфер обмена</string>
     <string name="thumbnailDescription">Логотип</string>
     <string name="settings">Настройки</string>
@@ -80,7 +76,6 @@
     <string name="expiryStateSentenceExpired">Срок действия истёк: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Срок действия истекает: <xliff:g>%s</xliff:g></string>
     <string name="points">Баллы</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> не похож на правильный баланс.</string>
     <string name="addManually">Ручной ввод номера</string>
     <string name="privacy_policy_popup_text">Уведомление о политике конфиденциальности (требуется некоторыми магазинами приложений):
 \n
@@ -130,7 +125,7 @@
     <string name="wrongValueForBarcodeType">Недопустимое значение для выбранного типа штрих-кода</string>
     <string name="app_resources">Свободные сторонние ресурсы: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Свободные сторонние библиотеки: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_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="intent_import_card_from_url_share_multiple_text">Поделиться картами</string>
     <string name="card_ids_copied">Скопированные номера</string>
     <string name="copy_to_clipboard_multiple_toast">Номера скопированы в буфер обмена</string>
@@ -213,8 +208,6 @@
     <string name="noGiftCardsGroup">Создайте несколько карт, а затем распределите их по группам здесь.</string>
     <string name="setIcon">Выбор миниатюры</string>
     <string name="selectColor">Выбрать цвет</string>
-    <string name="action_hide_details">Скрытие подробностей</string>
-    <string name="action_show_details">Отображение подробностей</string>
     <string name="translate_platform">на Weblate</string>
     <string name="shortcutSelectCard">Выбор карты</string>
     <string name="options">Параметры</string>
@@ -233,8 +226,6 @@
     <string name="settings_lock_on_opening_orientation">Фиксировать ориентацию при открытии карты</string>
     <string name="archive">Архивировать</string>
     <string name="unarchive">Разархивировать</string>
-    <string name="archiveList">Архив</string>
-    <string name="noUnarchivedCardsMessage">Нет карт вне архива</string>
     <string name="settings_follow_system_orientation">Как в системе</string>
     <string name="duplicateCard">Дублировать</string>
     <string name="settings_card_orientation">Ориентация штрих-кода</string>
@@ -286,7 +277,7 @@
     <string name="show_validity">Показывать срок действия</string>
     <string name="show_name_below_image_thumbnail">Показывать название под миниатюрой</string>
     <string name="show_balance">Показывать баланс</string>
-    <string name="permissionReadCardsDescription">Чтение ваших карт и всех их данных, включая заметки и изображения</string>
+    <string name="permissionReadCardsDescription">чтение ваших карт Catima и всех их данных, включая заметки и изображения</string>
     <string name="permissionReadCardsLabel">Чтение карт Catima</string>
     <string name="settings_allow_content_provider_read_summary">Приложениям по-прежнему придётся запрашивать разрешение для получения доступа</string>
     <string name="settings_allow_content_provider_read_title">Разрешать другим приложениям доступ к моим данным</string>
@@ -297,4 +288,8 @@
     <string name="settings_category_title_general">Общие</string>
     <string name="settings_disable_lockscreen_while_viewing_card_summary">Отключение функции блокировки экрана при отображении карты</string>
     <string name="settings_oled_dark_summary">Снижение расхода заряда батареи на OLED-экранах</string>
+    <string name="view_online">Просмотр в сети</string>
+    <string name="app_copyright_short">Авторское право © Sylvia van Os и помощники</string>
+    <string name="action_display_options">Настройки отображения</string>
+    <string name="show_archived_cards">Показывать архивные карты</string>
 </resources>

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

@@ -18,8 +18,6 @@
     <string name="scanCardBarcode">Skenovať čiarový kód</string>
     <string name="cardShortcut">Skratka</string>
     <string name="noCardsMessage">Najprv pridajte kartu</string>
-    <string name="noStoreError">Nebol zadaný žiadny názov</string>
-    <string name="noCardIdError">Nebolo zadané ID</string>
     <string name="noCardExistsError">Nepodarilo sa nájsť túto kartu</string>
     <string name="importExport">Import/Export</string>
     <string name="exportName">Export</string>
@@ -51,7 +49,6 @@
     <string name="deleteConfirmation">Naozaj chcete túto kartu odstrániť?</string>
     <string name="star">Pridať k obľúbeným</string>
     <string name="noBarcode">Žiadny čiarový kód</string>
-    <string name="barcodeNoBarcode">Čiarový kód nie je k dispozícii</string>
     <string name="barcodeType">Typ čiarových kódov</string>
     <string name="noMatchingGiftCards">Žiadne výsledky. Skúste zmeniť vyhľadávanie.</string>
     <string name="action_search">Vyhľadávanie</string>
@@ -89,7 +86,6 @@
     <string name="settings_system_theme">Systém</string>
     <string name="settings_theme">Téma</string>
     <string name="starImage">Obľúbená hviezda</string>
-    <string name="enterBarcodeInstructions">Zadajte ID a vyberte typ čiarového kódu nižšie alebo \"Nie je tu žiadny čiarový kód\".</string>
     <string name="exportOptionExplanation">Údaje sa zapíšu na vami zvolené miesto.</string>
     <string name="failedParsingImportUriError">Nepodarilo sa analyzovať import URI</string>
     <string name="share">Zdieľať</string>
@@ -127,7 +123,6 @@
     <string name="settings_theme_color">Farba témy</string>
     <string name="app_libraries">Slobodné knižnice tretích strán: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources">Slobodné zdroje tretích strán: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="action_show_details">Zobraziť detaily</string>
     <string name="importCatimaMessage">Vyberte svoj <i>catima.zip</i> export z aplikácie Catima, ktorý chcete importovať.
 \nVytvorte ho z ponuky Import/Export inej aplikácie Catima tak, že stlačíte tlačidlo Exportovať.</string>
     <string name="accept">Prijať</string>
@@ -146,7 +141,6 @@
     <string name="report_error">Nahlásiť chybu</string>
     <string name="translate_platform">na Weblate</string>
     <string name="showMoreInfo">Zobraziť podrobnosti</string>
-    <string name="action_hide_details">Skryť detaily</string>
     <string name="yes">Áno</string>
     <string name="importStocard">Import z aplikácie Stocard</string>
     <string name="selectColor">Vybrať farbu</string>
@@ -174,7 +168,6 @@
     <string name="settings_system_locale">Systém</string>
     <string name="app_copyright_old">Na základe Loyalty Card Keychain
 \ncopyright © 2016–2020 Branden Archer</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="expiryDate">Platnosť</string>
     <string name="editBarcode">Upraviť čiarový kód</string>
     <string name="privacy_policy">Zásady ochrany osobných údajov</string>
@@ -195,7 +188,6 @@
     <string name="updateBarcodeQuestionText">Zmenili ste ID. Chcete aktualizovať aj čiarový kód, aby používal rovnakú hodnotu\?</string>
     <string name="no">Nie</string>
     <string name="passwordRequired">Zadajte prosím heslo</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> sa nezdá byť platným zostatkom.</string>
     <string name="noGiftCardsGroup">Zatiaľ nemáte žiadne vernostné karty. Keď nejaké pridáte, môžete ich priradiť ku skupine tu.</string>
     <string name="noCameraPermissionDirectToSystemSetting">Na skenovanie čiarových kódov potrebuje Catima prístup k fotoaparátu. Ťuknite sem a zmeňte nastavenia oprávnení.</string>
     <string name="importCards">Importovať karty</string>
@@ -262,8 +254,6 @@
     <string name="copy_to_clipboard_multiple_toast">ID skopírované do schránky</string>
     <string name="intent_import_card_from_url_share_multiple_text">Chcem sa s vami zdielať karty</string>
     <string name="app_contributors">Podporili: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="archiveList">Archív</string>
-    <string name="noUnarchivedCardsMessage">Nie sú žiadne karty vrátené z archívu</string>
     <string name="newBalanceSentence">Nový zostatok: <xliff:g>%s</xliff:g></string>
     <string name="failedLaunchingPhotoPicker">Nepodarilo sa nájsť podporovanú aplikáciu galérie</string>
     <string name="show_note">Zobraziť poznámku</string>

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

@@ -18,8 +18,6 @@
     <string name="scanCardBarcode">Skeniraj črtno kodo</string>
     <string name="cardShortcut">Bližnjica do kartice</string>
     <string name="noCardsMessage">Najprej dodajte kartico</string>
-    <string name="noStoreError">Ime ni bilo vnešeno</string>
-    <string name="noCardIdError">ID številka kartice ni bila vnešena</string>
     <string name="noCardExistsError">Te kartice zvestobe ni bilo mogoče najti</string>
     <string name="importExport">Uvozi/izvozi</string>
     <string name="exportName">Izvozi</string>
@@ -68,7 +66,6 @@
     <string name="intent_import_card_from_url_share_text">Z vami želim deliti kartico</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Prepreči zaklepanje zaslona</string>
     <string name="settings_keep_screen_on">Ohranite zaslon vklopljen</string>
-    <string name="enterBarcodeInstructions">Vnesite ID kartice in spodaj izberite vrsto črtne kode ali izbiro \"Ta kartica nima črtne kode\".</string>
     <string name="settings_dark_theme">Temno</string>
     <string name="settings_light_theme">Svetlo</string>
     <string name="settings_system_theme">Sistem</string>
@@ -83,7 +80,6 @@
     <string name="unstar">Odstrani iz priljubljenih</string>
     <string name="star">Dodaj med priljubljene</string>
     <string name="noBarcode">Brez črtne kode</string>
-    <string name="barcodeNoBarcode">Ni črtne kode</string>
     <string name="barcodeType">Vrsta črtne kode</string>
     <string name="noMatchingGiftCards">Brez rezultata iskanja. Poskusite spremeniti iskalni niz.</string>
     <string name="action_search">Iskanje</string>
@@ -144,7 +140,6 @@
     <string name="yes">Da</string>
     <string name="frontImageDescription">Prednja stran</string>
     <string name="backImageDescription">Zadnja stran</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> ni veljavno stanje.</string>
     <string name="setBackImage">Nastavi sliko sprednje strani</string>
     <string name="setFrontImage">Nastavi sliko sprednje strani</string>
     <string name="photos">Fotografije</string>
@@ -184,7 +179,6 @@
     <string name="updateBalance">Posodobi stanje</string>
     <string name="failedToRetrieveImageFile">Slikovne datoteke ni bilo mogoče pridobiti</string>
     <string name="credits">Zasluge</string>
-    <string name="action_show_details">Prikaži podrobnosti</string>
     <string name="translate_platform">na Weblate-u</string>
     <string name="options">Možnosti</string>
     <string name="duplicateCard">Podvoji</string>
@@ -192,8 +186,6 @@
     <string name="unarchive">Odpakiraj arhiv</string>
     <string name="archived">Karta arhivirana</string>
     <string name="unarchived">Kartica ni arhivirana</string>
-    <string name="archiveList">Arhiv</string>
-    <string name="noUnarchivedCardsMessage">Ne obstajajo ne arhivirane kartice</string>
     <string name="failedLaunchingPhotoPicker">Ni mogoče najti podprte aplikacije za gledanje slik</string>
     <string name="previousCard">Prejšnje</string>
     <string name="nextCard">Naslednje</string>
@@ -236,7 +228,6 @@
     </plurals>
     <string name="cameraPermissionDeniedTitle">Ni bilo mogoče dostopati do kamere</string>
     <string name="noCameraPermissionDirectToSystemSetting">Catima potrebuje dostop do vaše kamere za skeniranje črtnih kod. Pritisnite tukaj in spremenite nastavitve dovoljenj.</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <plurals name="groupCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> kartica</item>
         <item quantity="two"><xliff:g>%d</xliff:g> kartici</item>
@@ -254,7 +245,6 @@
     <string name="settings_catima_theme">Catima</string>
     <string name="app_contributors">Omogočeno od: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="barcodeLongPressMessage">V aplikaciji za gledanje slik lahko odpremo samo slike</string>
-    <string name="action_hide_details">Skrij podrobnosti</string>
     <plurals name="groupCardCountWithArchived">
         <item quantity="one"><xliff:g>%1$d</xliff:g> kartica (<xliff:g id="archivedCount">%2$d</xliff:g> arhivirana)</item>
         <item quantity="two"><xliff:g>%1$d</xliff:g> kartici (<xliff:g id="archivedCount">%2$d</xliff:g> arhivirani)</item>
@@ -273,4 +263,9 @@
     <string name="validFromDate">Velja od</string>
     <string name="anyDate">Katerikoli datum</string>
     <string name="chooseValidFromDate">Izberite datum začetka veljavnosti</string>
-</resources>
+    <string name="permissionReadCardsDescription">preberite svoje kartice Catima in vse podrobnosti, vključno z opombami in slikami</string>
+    <string name="settings_display_barcode_max_brightness_summary">Potrebno za delovanje nekaterih skenerjev</string>
+    <string name="app_copyright_short">Copyright © Sylvia van Os in drugi sodelujoči</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os in drugi sodelujoči</string>
+    <string name="permissionReadCardsLabel">Preberite kartice Catima</string>
+</resources>

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

@@ -2,7 +2,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="settings_display_barcode_max_brightness">Gör streckkodsvyn ljusare</string>
     <string name="settings_keep_screen_on">Håll skärmen påslagen</string>
-    <string name="enterBarcodeInstructions">Ange ID:t och välj antingen streckkodstyp nedan, eller \"Det finns ingen streckkod\".</string>
     <string name="importFidmeMessage">Välj den exporterade <i>fidme-export-request-xxxxxx.zip</i> från FidMe som du vill importera och välj streckkodstyper manuellt efteråt.
 \nSkapa den från din FidMe-profil först genom att välja \"Data Protection\" och sen trycka på \"Extract my data\".</string>
     <string name="importOptionApplicationExplanation">Använd vilken app som helst eller den filhanterare du föredrar för att öppna en fil.</string>
@@ -85,7 +84,6 @@
     <string name="about_title_fmt">Om <xliff:g id="app_name">%s</xliff:g></string>
     <string name="app_copyright_old">Baserad på Loyalty Card Keychain
 \ncopyright © 2016–2020 Branden Archer</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="about">Om</string>
     <string name="importOptionApplicationTitle">Använd en annan app</string>
     <string name="importOptionFilesystemButton">Från filsystemet</string>
@@ -100,8 +98,6 @@
     <string name="importExportHelp">Säkerhetskopiering av din data möjliggör förflyttning av den till en annan enhet.</string>
     <string name="importExport">Importera/Exportera</string>
     <string name="noCardExistsError">Kunde inte hitta det kortet</string>
-    <string name="noCardIdError">Inget ID har angivits</string>
-    <string name="noStoreError">Inget namn har angivits</string>
     <string name="noCardsMessage">Lägg till ett kort först</string>
     <string name="cardShortcut">Kort-genväg</string>
     <string name="addCardTitle">Lägg till kort</string>
@@ -128,7 +124,6 @@
     <string name="unstar">Ta bort från favoriter</string>
     <string name="star">Lägg till i favoriter</string>
     <string name="noBarcode">Ingen streckkod</string>
-    <string name="barcodeNoBarcode">Det finns ingen streckkod</string>
     <string name="barcodeType">Streckkodstyp</string>
     <string name="cardId">Kort-ID</string>
     <string name="storeName">Namn</string>
@@ -153,7 +148,6 @@
     <string name="app_license">Copyleftad fri programvara, under GPLv3+-licens</string>
     <string name="app_resources">Fria tredjepartsresurser: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Fria tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> verkar inte vara ett giltigt saldo.</string>
     <string name="balance">Saldo</string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
     <string name="settings_disable_lockscreen_while_viewing_card">Förhindra skärmlåsning</string>
@@ -201,9 +195,7 @@
     <string name="group_name_is_empty">Gruppnamn måste anges</string>
     <string name="editGroup">Redigerar grupp: <xliff:g>%s</xliff:g></string>
     <string name="selectColor">Välj färg</string>
-    <string name="setIcon">Välj ikon</string>
-    <string name="action_show_details">Visa detaljer</string>
-    <string name="action_hide_details">Dölj detaljer</string>
+    <string name="setIcon">Ställ in miniatyr</string>
     <string name="credits">Bidragsgivare</string>
     <string name="source_repository">Källkodslager</string>
     <string name="noGiftCardsGroup">Skapa några kort och placera dem sedan i den här gruppen.</string>
@@ -225,14 +217,12 @@
     <string name="settings_lock_on_opening_orientation">Lås aktuell riktning när kort öppnas</string>
     <string name="unarchive">Ta tillbaks från arkiv</string>
     <string name="archived">Kort arkiverat</string>
-    <string name="archiveList">Arkivet</string>
     <string name="settings_follow_system_orientation">Spårsystem</string>
     <string name="duplicateCard">Kopiera</string>
     <string name="unarchived">Kort återläst från arkiv</string>
     <string name="nextCard">Nästa</string>
     <string name="archive">Arkivera</string>
     <string name="previousCard">Föregående</string>
-    <string name="noUnarchivedCardsMessage">Inga ej arkiverade kort finns</string>
     <plurals name="groupCardCountWithArchived">
         <item quantity="one"><xliff:g>%1$d</xliff:g> kort (<xliff:g id="archivedCount">%2$d</xliff:g> arkiverat)</item>
         <item quantity="other"><xliff:g>%1$d</xliff:g> kort (<xliff:g id="archivedCount">%2$d</xliff:g> arkiverade)</item>
@@ -259,4 +249,33 @@
     <string name="updateBalanceTitle">Hur mycket spenderade du\?</string>
     <string name="updateBalanceHint">Ange summa</string>
     <string name="newBalanceSentence">Ny balans: <xliff:g>%s</xliff:g></string>
-</resources>
+    <string name="openFrontImageInGalleryApp">Öppna bilden på framsidan i galleri-appen</string>
+    <string name="show_name_below_image_thumbnail">Visa namnet nedanför bildens miniatyr</string>
+    <string name="show_validity">Visa giltighet</string>
+    <string name="view_online">Visa på internet</string>
+    <string name="height">Höjd:</string>
+    <string name="settings_category_title_general">Generellt</string>
+    <string name="switchToBarcode">Byt till streckkod</string>
+    <string name="settings_disable_lockscreen_while_viewing_card_summary">Stänger av skärmlåset när kortet visas</string>
+    <string name="permissionReadCardsDescription">Läs dina kort och alla dess detaljer, inklusive anteckningar och bilder</string>
+    <string name="action_display_options">Visningsalternativ</string>
+    <string name="settings_display_barcode_max_brightness_summary">Nödvändigt för att en del skannrar ska fungera</string>
+    <string name="settings_oled_dark_summary">Reducerar batterianvändning på OLED-skärmar</string>
+    <string name="icon_header_click_text">Tryck länge för att redigera miniatyr</string>
+    <string name="settings_category_title_cards">Kort</string>
+    <string name="show_note">Visa anteckning</string>
+    <string name="switchToBackImage">Byt till bilden på baksidan</string>
+    <string name="app_copyright_short">Kopieringsskydd © Sylvia van Os och medverkande</string>
+    <string name="switchToFrontImage">Byt till bilden på framsidan</string>
+    <string name="settings_allow_content_provider_read_summary">Appar måste fortfarande begära åtkomst för att få tillgång</string>
+    <string name="setBarcodeHeight">Ställ in streckkodens höjd</string>
+    <string name="openBackImageInGalleryApp">Öppna bilden på baksidan i galleri-appen</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Kopieringsskydd © 2019–<xliff:g>%d</xliff:g> Sylvia van Os och medverkande</string>
+    <string name="settings_allow_content_provider_read_title">Tillåt andra appar att komma åt min data</string>
+    <string name="permissionReadCardsLabel">Läs Catima-kort</string>
+    <string name="donate">Donera</string>
+    <string name="show_archived_cards">Visa arkiverade kort</string>
+    <string name="settings_category_title_privacy">Sekretess</string>
+    <string name="show_balance">Visa konto</string>
+    <string name="settings_keep_screen_on_summary">Stänger av skärmens tidsgräns medan ett kort visas</string>
+</resources>

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

@@ -57,7 +57,6 @@
     <string name="privacy_policy">Gizlilik Politikası</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="chooseImportType">Verileri şuradan içe aktar</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> geçerli bir bakiye gibi görünmüyor.</string>
     <string name="points">Puan</string>
     <string name="currency">Para birimi</string>
     <string name="balance">Bakiye</string>
@@ -104,7 +103,6 @@
     <string name="starImage">Sık kullanılan yıldız</string>
     <string name="thumbnailDescription">Küçük resim</string>
     <string name="copy_to_clipboard_toast">Numara panoya kopyalandı</string>
-    <string name="enterBarcodeInstructions">Numarasını girin ve aşağıdan barkod türünü veya “Barkod yok” seçeneğini seçin.</string>
     <string name="selectBarcodeTitle">Barkod Seç</string>
     <string name="app_resources">Özgür üçüncü taraf kaynakları: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Özgür üçüncü taraf kütüphaneleri: <xliff:g id="app_libraries_list">%s</xliff:g></string>
@@ -113,7 +111,7 @@
     <string name="app_license">GPLv3+ altında lisanslanan copyleft özgür yazılım</string>
     <string name="app_copyright_old">Loyalty Card Keychain temel alınmıştır
 \nTelif Hakkı © 2016–2020 Branden Archer</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Telif Hakkı © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Telif Hakkı © 2019–<xliff:g>%d</xliff:g> Sylvia van Os ve katkıda bulunanlar</string>
     <string name="about">Hakkında</string>
     <string name="importOptionApplicationButton">Başka bir uygulama kullan</string>
     <string name="importOptionApplicationExplanation">Bir dosyayı açmak için herhangi bir uygulamayı veya en sevdiğiniz dosya yöneticisini kullanın.</string>
@@ -135,8 +133,6 @@
     <string name="importExport">İçe/Dışa aktar</string>
     <string name="failedParsingImportUriError">İçe aktarma URI\'si ayrıştırılamadı</string>
     <string name="noCardExistsError">Bu kart bulunamadı</string>
-    <string name="noCardIdError">Numara girilmedi</string>
-    <string name="noStoreError">Ad girilmedi</string>
     <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> barkod görüntüsü</string>
     <string name="card_ids_copied">Numara(lar) kopyalandı</string>
     <string name="copy_to_clipboard">Numarayı panoya kopyala</string>
@@ -167,7 +163,6 @@
     <string name="unstar">Sık kullanılanlardan kaldır</string>
     <string name="star">Sık kullanılanlara ekle</string>
     <string name="noBarcode">Barkod yok</string>
-    <string name="barcodeNoBarcode">Barkod yok</string>
     <string name="barcodeType">Barkod türü</string>
     <string name="note">Not</string>
     <string name="storeName">Ad</string>
@@ -205,8 +200,6 @@
     <string name="group_updated">Grup güncellendi</string>
     <string name="selectColor">Renk seç</string>
     <string name="setIcon">Küçük resim ayarla</string>
-    <string name="action_show_details">Ayrıntıları göster</string>
-    <string name="action_hide_details">Ayrıntıları gizle</string>
     <string name="translate_platform">Weblate\'de</string>
     <string name="shortcutSelectCard">Kart seç</string>
     <string name="options">Seçenekler</string>
@@ -224,8 +217,6 @@
     <string name="duplicateCard">Çoğalt</string>
     <string name="unarchive">Arşivden çıkar</string>
     <string name="archived">Kart arşivlendi</string>
-    <string name="archiveList">Arşiv</string>
-    <string name="noUnarchivedCardsMessage">Arşivden çıkarılan kart yok</string>
     <string name="settings_card_orientation">Barkod yönü</string>
     <string name="settings_lock_on_opening_orientation">Kartı açarken kullanılan yönü kilitle</string>
     <string name="unarchived">Kart arşivden çıkarıldı</string>
@@ -283,4 +274,8 @@
     <string name="settings_category_title_privacy">Gizlilik</string>
     <string name="settings_oled_dark_summary">OLED ekranlarda güç kullanımını düşürür</string>
     <string name="settings_category_title_cards">Kartlar</string>
+    <string name="app_copyright_short">Telif hakkı © Sylvia van Os ve katkıda bulunanlar</string>
+    <string name="action_display_options">Görüntüleme seçenekleri</string>
+    <string name="show_archived_cards">Arşivlenen kartları göster</string>
+    <string name="view_online">Çevrim içi görüntüle</string>
 </resources>

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

@@ -5,17 +5,15 @@
 \nЖОДНОЇ ІНФОРМАЦІЇ НЕ ЗБИРАЄТЬСЯ, що може підтвердити будь-хто, адже наш застосунок це вільне програмне забезпечення.</string>
     <string name="noGiftCards">Натисніть кнопку +, щоб додати картку, або ⋮ для імпорту з меню.</string>
     <string name="settings_display_barcode_max_brightness">Яскравіший штрих-код</string>
-    <string name="enterBarcodeInstructions">Введіть ID та оберіть тип штрих-коду чи \"Не має штрих-коду\".</string>
     <string name="selectBarcodeTitle">Оберіть штрих-код</string>
     <string name="scanCardBarcode">Відсканувати штрих-код</string>
     <string name="noBarcode">Без штрих-коду</string>
-    <string name="barcodeNoBarcode">Штрих-код відсутній</string>
     <string name="barcodeType">Тип штрих-коду</string>
     <plurals name="groupCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> картка</item>
-        <item quantity="few"><xliff:g>%d</xliff:g> карток</item>
-        <item quantity="many"><xliff:g>%d</xliff:g> картки</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> картки</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> картки</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> карток</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> карток</item>
     </plurals>
     <string name="no">НІ</string>
     <string name="yes">Так</string>
@@ -40,9 +38,8 @@
     <string name="importCatima">Імпорт з Catima</string>
     <string name="accept">Прийняти</string>
     <string name="privacy_policy">Політика конфіденційності</string>
-    <string name="app_loyalty_card_keychain">Брелок для картки лояльності</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="chooseImportType">Імпортувати дані з</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> здається, не є дійсним залишком.</string>
     <string name="points">Бали</string>
     <string name="currency">Валюта</string>
     <string name="balance">Баланс</string>
@@ -67,12 +64,12 @@
     <string name="failedOpeningFileManager">Спочатку встановіть файловий менеджер.</string>
     <string name="deleteConfirmationGroup">Видалити групу\?</string>
     <string name="all">Усі</string>
-    <string name="noGroups">Натисніть + щоб додати групи для категоризації.</string>
+    <string name="noGroups">Натисніть +, щоб додати групи для категоризації.</string>
     <string name="groups">Групи</string>
     <string name="enter_group_name">Введіть ім\'я групи</string>
     <string name="exportSuccessful">Дані експортовано</string>
     <string name="importSuccessful">Дані імпортовано</string>
-    <string name="intent_import_card_from_url_share_text">Я хочу поділитися з тобою картою</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_dark_theme">Темна</string>
@@ -82,49 +79,47 @@
     <string name="settings">Налаштування</string>
     <string name="starImage">Улюблена зірка</string>
     <string name="thumbnailDescription">Ескіз</string>
-    <string name="intent_import_card_from_url_share_multiple_text">Я хочу поділитися деякими картами з тобою</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Я хочу поділитися з тобою деякими картками</string>
     <string name="copy_to_clipboard_multiple_toast">ID скопійовано до буферу обміну</string>
     <string name="copy_to_clipboard_toast">ID скопійовано до буферу обміну</string>
     <string name="app_resources">Вільні ресурси третіх сторін: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Вільні бібліотеки третіх сторін: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="debug_version_fmt">Версія: <xliff:g id="version">%s</xliff:g></string>
     <string name="about_title_fmt">Про <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="app_license">Копілефт вільне програмне забезпечення, ліцензоване під GPLv3+</string>
+    <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="about">Про програму</string>
-    <string name="importOptionApplicationButton">Використовувати інший застосунок</string>
-    <string name="importOptionApplicationExplanation">Використайте інший застосунок чи ваш улюблений файл-менеджер для відкриття файлу.</string>
-    <string name="importOptionApplicationTitle">З іншого застосунку</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>
+    <string name="importOptionApplicationTitle">Використати інший застосунок</string>
     <string name="importOptionFilesystemButton">Обрати файл</string>
-    <string name="importOptionFilesystemExplanation">Оберіть файл у провіднику.</string>
+    <string name="importOptionFilesystemExplanation">Оберіть потрібний файл у провіднику.</string>
     <string name="importOptionFilesystemTitle">Імпорт з файлу</string>
-    <string name="exportOptionExplanation">Дані буде записано до локації обраної вами.</string>
-    <string name="exporting">Експортуємо…</string>
-    <string name="importing">Імпортуємо…</string>
-    <string name="exportFailed">Неможливо здійснити експорт</string>
+    <string name="exportOptionExplanation">Дані будуть записані у вибране вами місце.</string>
+    <string name="exporting">Експорт…</string>
+    <string name="importing">Імпорт…</string>
+    <string name="exportFailed">Не вдалося здійснити експорт</string>
     <string name="exportFailedTitle">Помилка експорту</string>
     <string name="exportSuccessfulTitle">Експортовано</string>
-    <string name="importFailed">Неможливо здійснити імпорт</string>
+    <string name="importFailed">Не вдалося здійснити імпорт</string>
     <string name="importFailedTitle">Помилка імпорту</string>
     <string name="importSuccessfulTitle">Імпортовано</string>
-    <string name="importExportHelp">Резервна копія даних дозволяє перемістити їх до іншого пристрою.</string>
+    <string name="importExportHelp">Резервне копіювання даних дозволяє перенести їх на інший пристрій.</string>
     <string name="exportName">Експорт</string>
     <string name="importExport">Імпорт/Експорт</string>
-    <string name="failedParsingImportUriError">Неможливо опрацювати імпорт-URI</string>
-    <string name="noCardExistsError">Карту не знайдено</string>
-    <string name="noCardIdError">ID не введено</string>
-    <string name="noStoreError">Ім\'я не введено</string>
+    <string name="failedParsingImportUriError">Не вдалося розібрати URI імпорту</string>
+    <string name="noCardExistsError">Не вдалося знайти цю картку</string>
     <string name="card_ids_copied">ID скопійовано</string>
-    <string name="noCardsMessage">Спочатку додайте карту</string>
-    <string name="cardShortcut">Швидкий виклик карти</string>
-    <string name="addCardTitle">Додати карту</string>
-    <string name="editCardTitle">Редагувати карту</string>
+    <string name="noCardsMessage">Спочатку додайте картку</string>
+    <string name="cardShortcut">Ярлик картки</string>
+    <string name="addCardTitle">Додати картку</string>
+    <string name="editCardTitle">Редагувати картку</string>
     <string name="sendLabel">Відправити…</string>
     <string name="share">Поділитися</string>
     <string name="copy_to_clipboard">Копіювати ID до буферу обміну</string>
-    <string name="ok">ОК</string>
+    <string name="ok">Добре</string>
     <string name="confirm">Підтвердити</string>
     <string name="delete">Видалити</string>
     <string name="edit">Редагувати</string>
@@ -133,8 +128,8 @@
     <string name="unstar">Видалити з улюблених</string>
     <string name="star">Додати до улюблених</string>
     <string name="cardId">ID картки</string>
-    <string name="note">Замітка</string>
-    <string name="storeName">Ім\'я</string>
+    <string name="note">Примітка</string>
+    <string name="storeName">Назва</string>
     <string name="noMatchingGiftCards">Збігів не знайдено. Спробуйте змінити параметри пошуку.</string>
     <string name="action_add">Додати</string>
     <string name="action_search">Пошук</string>
@@ -159,7 +154,7 @@
         <item quantity="other">Обрано: <xliff:g>%d</xliff:g></item>
     </plurals>
     <string name="deleteTitle">Видалити картку</string>
-    <string name="deleteConfirmation">Бажаєте видалити карту\?</string>
+    <string name="deleteConfirmation">Видалити цю картку назавжди\?</string>
     <plurals name="deleteCardsTitle">
         <item quantity="one">Видалити <xliff:g>%d</xliff:g> картку</item>
         <item quantity="few">Видалити <xliff:g>%d</xliff:g> картки</item>
@@ -167,10 +162,10 @@
         <item quantity="other">Видалити <xliff:g>%d</xliff:g> карток</item>
     </plurals>
     <plurals name="deleteCardsConfirmation">
-        <item quantity="one">Видалити цю <xliff:g>%d</xliff:g> карту назавжди\?</item>
-        <item quantity="few">Видалити ці <xliff:g>%d</xliff:g> карти назавжди\?</item>
-        <item quantity="many">Видалити ці <xliff:g>%d</xliff:g> карт назавжди\?</item>
-        <item quantity="other">Видалити ці <xliff:g>%d</xliff:g> карт назавжди\?</item>
+        <item quantity="one">Видалити цю <xliff:g>%d</xliff:g> картку назавжди\?</item>
+        <item quantity="few">Видалити ці <xliff:g>%d</xliff:g> картки назавжди\?</item>
+        <item quantity="many">Видалити ці <xliff:g>%d</xliff:g> карток назавжди\?</item>
+        <item quantity="other">Видалити ці <xliff:g>%d</xliff:g> карток назавжди\?</item>
     </plurals>
     <string name="settings_blue_theme">Синій</string>
     <string name="settings_violet_theme">Фіолетовий</string>
@@ -210,13 +205,11 @@
     <string name="editGroup">Редагування групи: <xliff:g>%s</xliff:g></string>
     <string name="group_edit">Змінити групу</string>
     <string name="group_name_already_in_use">Група з такою назвою вже існує</string>
-    <string name="noGiftCardsGroup">Створите кілька карток, та призначте їх до групи тут.</string>
+    <string name="noGiftCardsGroup">Створіть кілька карток та призначте їх до групи тут.</string>
     <string name="selectColor">Вибір кольору</string>
     <string name="setIcon">Вибір мініатюри</string>
-    <string name="action_show_details">Показати деталі</string>
-    <string name="action_hide_details">Сховати деталі</string>
     <string name="translate_platform">на Weblate</string>
-    <string name="shortcutSelectCard">Оберіть карту</string>
+    <string name="shortcutSelectCard">Оберіть картку</string>
     <string name="options">Параметри</string>
     <string name="showMoreInfo">Відобразити дані</string>
     <string name="starred">Обране</string>
@@ -233,18 +226,16 @@
     <string name="settings_follow_system_orientation">Як у системі</string>
     <string name="duplicateCard">Дублювати</string>
     <string name="archive">Архівувати</string>
-    <string name="settings_portrait_orientation">Поличчя</string>
-    <string name="settings_landscape_orientation">Краєвид</string>
-    <string name="settings_lock_on_opening_orientation">Блокування орієнтації при відкритті картки</string>
+    <string name="settings_portrait_orientation">Вертикальна</string>
+    <string name="settings_landscape_orientation">Горизонтальна</string>
+    <string name="settings_lock_on_opening_orientation">Фіксація орієнтації під час відкриття картки</string>
     <string name="archived">Картка архівована</string>
     <string name="unarchived">Картка розархівована</string>
-    <string name="archiveList">Архів</string>
-    <string name="noUnarchivedCardsMessage">Немає не архівованих карток</string>
     <plurals name="groupCardCountWithArchived">
-        <item quantity="one"><xliff:g>%1$d</xliff:g> карту (<xliff:g id="archivedCount">%2$d</xliff:g> заархівовано)</item>
-        <item quantity="few"><xliff:g>%1$d</xliff:g> карти (<xliff:g id="archivedCount">%2$d</xliff:g> заархівовано)</item>
-        <item quantity="many"><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>
+        <item quantity="one"><xliff:g>%1$d</xliff:g> картка (<xliff:g id="archivedCount">%2$d</xliff:g> архівована)</item>
+        <item quantity="few"><xliff:g>%1$d</xliff:g> картки (<xliff:g id="archivedCount">%2$d</xliff:g> архівовано)</item>
+        <item quantity="many"><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>
     <string name="failedLaunchingPhotoPicker">Підтримуваний застосунок галереї не знайдено</string>
     <string name="previousCard">Попередня</string>
@@ -265,7 +256,7 @@
     <string name="currentBalanceSentence">Поточний баланс: <xliff:g>%s</xliff:g></string>
     <string name="newBalanceSentence">Новий баланс: <xliff:g>%s</xliff:g></string>
     <string name="cameraPermissionDeniedTitle">Не вдалося отримати доступ до камери</string>
-    <string name="noCameraPermissionDirectToSystemSetting">Для сканування штрих-кодів програмі Catima потрібен доступ до вашої камери. Натисніть тут, щоб змінити дозволи.</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Для сканування штрих-кодів, Catima потрібен доступ до вашої камери. Натисніть тут, щоб змінити дозволи.</string>
     <string name="updateBalance">Оновити баланс</string>
     <string name="storageReadPermissionRequired">Дозвіл на читання сховища, необхідний для цієї дії…</string>
     <string name="cameraPermissionRequired">Дозвіл на доступ до камери, необхідний для цієї дії…</string>
@@ -276,8 +267,8 @@
     <string name="switchToFrontImage">Перемкнутися на лицьову сторону</string>
     <string name="switchToBackImage">Перемкнутися на зворотню сторону</string>
     <string name="switchToBarcode">Перемкнутися на штрих-код</string>
-    <string name="openFrontImageInGalleryApp">Відкрити зображення лицьової сторони у додату галереї</string>
-    <string name="openBackImageInGalleryApp">Відкрити зображення тильної сторони у додатку галереї</string>
+    <string name="openFrontImageInGalleryApp">Відкрити зображення лицьової сторони у застосунку галереї</string>
+    <string name="openBackImageInGalleryApp">Відкрити зображення тильної сторони у застосунку галереї</string>
     <string name="setBarcodeHeight">Встановити висоту штрих-коду</string>
     <string name="height">Висота:</string>
     <string name="donate">Пожертвувати</string>
@@ -286,15 +277,19 @@
     <string name="show_note">Показати примітку</string>
     <string name="show_validity">Показати термін дії</string>
     <string name="show_balance">Показати баланс</string>
-    <string name="permissionReadCardsLabel">Читати карти Catima</string>
-    <string name="settings_allow_content_provider_read_summary">Додатки все ще муситимуть запитувати дозвіл на отримання доступу</string>
-    <string name="permissionReadCardsDescription">Читати всі ваші карти та їх деталі, в тому числі нотатки та зображення</string>
+    <string name="permissionReadCardsLabel">Читати картки Catima</string>
+    <string name="settings_allow_content_provider_read_summary">Застосунки все ще муситимуть запитувати дозвіл на отримання доступу</string>
+    <string name="permissionReadCardsDescription">читайте ваші картки Catima та всю інформацію на них, включно з примітками та зображеннями</string>
     <string name="settings_display_barcode_max_brightness_summary">Необхідно для роботи деяких сканерів</string>
     <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_allow_content_provider_read_title">Дозволити іншим застосункам доступ до моїх даних</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>
-</resources>
+    <string name="view_online">Переглянути онлайн</string>
+    <string name="action_display_options">Налаштування дисплея</string>
+    <string name="app_copyright_short">Авторські права © Sylvia van Os та вкладники</string>
+    <string name="show_archived_cards">Показати архівовані картки</string>
+</resources>

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

@@ -10,7 +10,6 @@
     <string name="card">卡片</string>
     <string name="addManually">手动输入卡号</string>
     <string name="settings_system_theme">系统设置</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="importOptionApplicationButton">使用其他应用</string>
     <string name="importOptionFilesystemButton">使用文件系统</string>
     <string name="unstar">从收藏中移除</string>
@@ -40,7 +39,6 @@
     <string name="privacy_policy">隐私政策</string>
     <string name="app_loyalty_card_keychain">会员卡卡包</string>
     <string name="chooseImportType">数据导入源</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g>似乎不是有效的余额。</string>
     <string name="points">积分</string>
     <string name="currency">货币</string>
     <string name="balance">余额</string>
@@ -77,7 +75,6 @@
     <string name="settings">设置</string>
     <string name="thumbnailDescription">缩略图</string>
     <string name="copy_to_clipboard_toast">已复制卡号到剪贴板</string>
-    <string name="enterBarcodeInstructions">输入卡号，并从下面选择其条码类型，或选择“无条码”。</string>
     <string name="selectBarcodeTitle">选择条码</string>
     <string name="app_resources">第三方自由资源：<xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_license">本软件为自由软件，使用 GPLv3+ 许可证</string>
@@ -104,8 +101,6 @@
     <string name="importExport">导入/导出</string>
     <string name="failedParsingImportUriError">无法解析导入 URI</string>
     <string name="noCardExistsError">找不到卡片</string>
-    <string name="noCardIdError">未输入卡号</string>
-    <string name="noStoreError">未输入卡片名称</string>
     <string name="card_ids_copied">已复制卡号</string>
     <string name="noCardsMessage">请先添加一张卡片</string>
     <string name="cardShortcut">卡片快捷键</string>
@@ -123,7 +118,6 @@
     <string name="cancel">取消</string>
     <string name="star">添加到收藏</string>
     <string name="noBarcode">无条形码</string>
-    <string name="barcodeNoBarcode">无可用条形码</string>
     <string name="barcodeType">条形码类型</string>
     <string name="cardId">卡号</string>
     <string name="note">备注</string>
@@ -208,8 +202,6 @@
     <string name="exportPassword">设置密码来保护导出的内容（可选）</string>
     <string name="settings_magenta_theme">紫红</string>
     <string name="settings_violet_theme">紫色</string>
-    <string name="action_show_details">显示详情</string>
-    <string name="action_hide_details">隐藏详情</string>
     <string name="app_contributors">因他们而存在: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="and_data_usage">和数据使用方法</string>
     <string name="failedLaunchingPhotoPicker">找不到支持的图库应用</string>
@@ -231,8 +223,6 @@
     <string name="unarchive">移出归档</string>
     <string name="archived">卡片已归档</string>
     <string name="unarchived">卡片未归档</string>
-    <string name="archiveList">已归档卡</string>
-    <string name="noUnarchivedCardsMessage">没有未归档卡</string>
     <string name="failedToOpenUrl">先安装一个浏览器</string>
     <string name="welcome">欢迎使用Catima</string>
     <string name="updateBalanceHint">输入金额</string>
@@ -268,7 +258,7 @@
     <string name="permissionReadCardsLabel">读取 Catima 卡</string>
     <string name="settings_allow_content_provider_read_summary">应用程序仍然需要请求权限</string>
     <string name="settings_allow_content_provider_read_title">允许其他应用程序访问我的数据</string>
-    <string name="permissionReadCardsDescription">读取你的卡片及其所有细节，包括笔记和图像</string>
+    <string name="permissionReadCardsDescription">读取你的 Catima 卡片及其所有细节，包括笔记和图像</string>
     <string name="settings_keep_screen_on_summary">在查看卡片时禁止屏幕超时</string>
     <string name="settings_oled_dark_summary">减少 OLED 显示屏上的电池使用量</string>
     <string name="settings_category_title_privacy">隐私</string>
@@ -276,4 +266,9 @@
     <string name="settings_display_barcode_max_brightness_summary">一些扫描仪工作所必需的</string>
     <string name="settings_category_title_cards">卡包</string>
     <string name="settings_category_title_general">常规</string>
+    <string name="action_display_options">显示选项</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">版权所有 © 2019–<xliff:g>%d</xliff:g> Sylvia van Os 及其贡献者们</string>
+    <string name="show_archived_cards">显示已存档的卡片</string>
+    <string name="app_copyright_short">版权所有 © Sylvia van Os 及其贡献者们</string>
+    <string name="view_online">在线查看</string>
 </resources>

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

@@ -8,7 +8,6 @@
     <string name="note">註記</string>
     <string name="cardId">卡片 ID</string>
     <string name="barcodeType">條碼種類</string>
-    <string name="barcodeNoBarcode">沒有可用的條碼</string>
     <string name="noBarcode">無條碼</string>
     <string name="privacy_policy_popup_text">隱私權政策（某些應用程式商店需要此條目）: 
 \n
@@ -50,7 +49,6 @@
     <string name="editBarcode">編輯條碼</string>
     <string name="editCardTitle">編輯圖片</string>
     <string name="enter_group_name">輸入群組名稱</string>
-    <string name="enterBarcodeInstructions">輸入 ID、選擇條碼種類、或選擇「此卡片沒有可用的條碼」。</string>
     <string name="errorReadingImage">無法讀取此圖片</string>
     <string name="expiryDate">逾期日期</string>
     <string name="expiryStateSentence">逾期於：<xliff:g>%s</xliff:g></string>
@@ -84,7 +82,6 @@
     <string name="no">否</string>
     <string name="noBarcodeFound">找不到可用的條碼</string>
     <string name="noCardExistsError">無法找到此卡片</string>
-    <string name="noCardIdError">尚未輸入 ID</string>
     <string name="noCardsMessage">請先新增卡片</string>
     <string name="sort">排列</string>
     <string name="settings_catima_theme">Catima</string>
@@ -154,7 +151,6 @@
     <string name="ok">OK</string>
     <string name="sendLabel">送出…</string>
     <string name="scanCardBarcode">掃描條碼</string>
-    <string name="noStoreError">尚未輸入卡片名稱</string>
     <string name="importExportHelp">備份您的資料以將其轉移至其他裝置中。</string>
     <string name="importOptionFilesystemTitle">自檔案系統中匯入</string>
     <string name="importOptionFilesystemExplanation">自檔案系統中選取檔案。</string>
@@ -179,7 +175,6 @@
     <string name="importCatimaMessage">選取您自 Catima 匯出的 <i>catima.zip</i> 檔案以進行匯入。
 \n您可透過其他裝置的 Catima 程式中的匯入／匯出選單進行匯出。</string>
     <string name="points">點</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> 似乎不是個可用的餘額數值。</string>
     <string name="app_libraries">第三方自由函式庫：<xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources">第三方自由資源：<xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">選擇條碼</string>
@@ -194,7 +189,6 @@
     <string name="starImage">收藏標示</string>
     <string name="noGiftCardsGroup">建立一些卡片，然後將它們分配到這個群組中。</string>
     <string name="showMoreInfo">顯示資訊</string>
-    <string name="action_show_details">顯示詳情</string>
     <string name="shortcutSelectCard">選擇卡片</string>
     <string name="starred">已收藏</string>
     <plurals name="balancePoints">
@@ -208,7 +202,6 @@
     <string name="group_updated">已更新群組</string>
     <string name="editGroup">編輯群組中：<xliff:g>%s</xliff:g></string>
     <string name="settings_oled_dark">使用深色主題時，使用純黑色背景</string>
-    <string name="action_hide_details">隱藏詳情</string>
     <string name="translate_platform">於 Weblate</string>
     <string name="options">選項</string>
     <string name="include_if_asking_support">如果您想請求協助，請附上以下訊息：</string>
@@ -227,10 +220,8 @@
     <string name="settings_follow_system_orientation">跟隨系統</string>
     <string name="settings_landscape_orientation">橫向</string>
     <string name="failedToOpenUrl">先安裝網頁瀏覽器</string>
-    <string name="archiveList">封存</string>
     <string name="failedLaunchingPhotoPicker">無法找到支援的圖庫應用程式</string>
     <string name="previousCard">上一張</string>
-    <string name="noUnarchivedCardsMessage">沒有已封存的卡片</string>
     <string name="nextCard">下一張</string>
     <string name="welcome">歡迎使用 Catima</string>
     <plurals name="viewArchivedCardsWithCount">
@@ -264,4 +255,5 @@
     <string name="openBackImageInGalleryApp">以圖庫軟體開啟背面圖片</string>
     <string name="show_name_below_image_thumbnail">在縮圖下方顯示名稱</string>
     <string name="setBarcodeHeight">設定條碼高度</string>
-</resources>
+    <string name="app_copyright_short">著作權所有© Sylvia van Os and contributors</string>
+</resources>

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

@@ -58,16 +58,22 @@
         <item>@string/settings_brown_theme</item>
     </string-array>
 
+    <!--
+      NB: this list needs to be updated manually for new/removed languages and
+      is used to generate the locale lists in app/build.gradle and
+      app/src/main/res/xml/locales_config.xml using .scripts/locales.py
+    -->
     <string-array name="locale_values">
         <item />
         <item>ar</item>
+        <!-- <item>ast</item> -->
         <item>bg</item>
         <item>bn</item>
         <item>bn-rIN</item>
         <item>bs</item>
-        <item>ca</item>
+        <!-- <item>ca</item> -->
         <item>cs</item>
-        <item>cy</item>
+        <!-- <item>cy</item> -->
         <item>da</item>
         <item>de</item>
         <item>el-rGR</item>
@@ -86,6 +92,7 @@
         <item>it</item>
         <item>ja</item>
         <item>ko</item>
+        <!-- <item>lb</item> -->
         <item>lt</item>
         <item>lv</item>
         <item>nb-rNO</item>
@@ -100,7 +107,7 @@
         <item>sv</item>
         <item>tr</item>
         <item>uk</item>
-        <item>zh-TW</item>
+        <item>zh-rTW</item>
         <item>zh-rCN</item>
     </string-array>
 
@@ -122,7 +129,6 @@
         <item>#f16364</item>
         <item>#f58559</item>
         <item>#f9a43e</item>
-        <item>#e4c62e</item>
         <item>#67bf74</item>
         <item>#59a2be</item>
         <item>#2093cd</item>

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

@@ -13,7 +13,6 @@
     <string name="note">Note</string>
     <string name="cardId">Card ID</string>
     <string name="barcodeType">Barcode type</string>
-    <string name="barcodeNoBarcode">There is no barcode</string>
     <string name="noBarcode">No barcode</string>
     <string name="star">Add to favorites</string>
     <string name="unstar">Remove from favorites</string>
@@ -50,8 +49,6 @@
     <string name="card_ids_copied">Copied ID(s)</string>
     <!-- %s is a type of barcode here -->
     <string name="barcodeImageDescriptionWithType">Image <xliff:g>%s</xliff:g> barcode</string>
-    <string name="noStoreError">No name entered</string>
-    <string name="noCardIdError">No ID entered</string>
     <string name="noCardExistsError">Could not find that card</string>
     <string name="failedParsingImportUriError">Could not parse the import URI</string>
     <string name="importExport">Import/Export</string>
@@ -68,7 +65,7 @@
     <string name="storageReadPermissionRequired">Permission to read storage needed for this action…</string>
     <string name="cameraPermissionRequired">Permission to access camera needed for this action…</string>
     <string name="permissionReadCardsLabel">Read Catima Cards</string>
-    <string name="permissionReadCardsDescription">Read your cards and all its details, including notes and images</string>
+    <string name="permissionReadCardsDescription">read your Catima cards and all its details, including notes and images</string>
     <string name="cameraPermissionDeniedTitle">Could not access the camera</string>
     <string name="noCameraPermissionDirectToSystemSetting">To scan barcodes, Catima will need access to your camera. Tap here to change your permission settings.</string>
     <string name="exportOptionExplanation">The data will be written to a location of your choice.</string>
@@ -79,7 +76,8 @@
     <string name="importOptionApplicationExplanation">Use any app or your favorite file manager to open a file.</string>
     <string name="importOptionApplicationButton">Use another app</string>
     <string name="about">About</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os and contributors</string>
+    <string name="app_copyright_short">Copyright © Sylvia van Os and contributors</string>
     <string name="app_copyright_old">Based on Loyalty Card Keychain\ncopyright © 2016–2020 Branden Archer</string>
     <string name="app_license">Copylefted libre software, licensed GPLv3+</string>
     <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
@@ -87,7 +85,6 @@
     <string name="app_libraries">Libre third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources">Libre third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Select Barcode</string>
-    <string name="enterBarcodeInstructions">Enter the ID, and either pick a barcode type below, or “There is no barcode”.</string>
     <string name="copy_to_clipboard_toast">ID copied to clipboard</string>
     <string name="thumbnailDescription">Thumbnail</string>
     <string name="starImage">Favorite star</string>
@@ -149,7 +146,7 @@
         <item quantity="other"><xliff:g>%d</xliff:g> cards</item>
     </plurals>
     <string name="group_name_already_in_use">Group name already in use</string>
-    <string name="group_name_is_empty">Group name cannot be empty</string>
+    <string name="group_name_is_empty">Group name must not be empty</string>
     <string name="group_updated">Group updated</string>
     <string name="all">All</string>
     <string name="deleteConfirmationGroup">Delete group?</string>
@@ -158,8 +155,8 @@
     <string name="moveDown">Move downwards</string>
     <string name="leaveWithoutSaveTitle">Exit</string>
     <string name="leaveWithoutSaveConfirmation">Leave without saving?</string>
-    <string name="addManually">Manually enter ID</string>
-    <string name="addFromImage">Select image from gallery</string>
+    <string name="addManually">Enter the barcode manually</string>
+    <string name="addFromImage">Select an image from gallery</string>
     <string name="groupsList">Groups: <xliff:g>%s</xliff:g></string>
     <string name="editGroup">Editing Group: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Expires: <xliff:g>%s</xliff:g></string>
@@ -180,7 +177,7 @@
     <string name="balance">Balance</string>
     <string name="currency">Currency</string>
     <string name="points">Points</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> does not seem to be a valid balance.</string>
+    <string name="balanceParsingFailed">Invalid balance</string>
     <string name="chooseImportType">Import data from</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="privacy_policy">Privacy Policy</string>
@@ -275,8 +272,6 @@
     <string name="rate_this_app">Rate this app</string>
     <string name="on_google_play">on Google Play</string>
     <string name="report_error">Report Error</string>
-    <string name="action_show_details">Show details</string>
-    <string name="action_hide_details">Hide details</string>
     <string name="translate_platform">on Weblate</string>
     <string name="shortcutSelectCard">Select a card</string>
     <string name="options">Options</string>
@@ -287,9 +282,7 @@
     <string name="unarchive">Unarchive</string>
     <string name="archived">Card archived</string>
     <string name="unarchived">Card unarchived</string>
-    <string name="archiveList">Archive</string>
     <string name="overflowMenu" translatable="false">Overflow menu</string>
-    <string name="noUnarchivedCardsMessage">No unarchived cards exist</string>
     <string name="failedLaunchingPhotoPicker">Could not find a supported gallery app</string>
     <plurals name="groupCardCountWithArchived">
         <item quantity="one"><xliff:g>%1$d</xliff:g> card (<xliff:g id="archivedCount">%2$d</xliff:g> archived)</item>
@@ -325,11 +318,22 @@
     <string name="show_note">Show note</string>
     <string name="show_balance">Show balance</string>
     <string name="show_validity">Show validity</string>
+    <string name="sharedpreference_card_details_show_name_below_thumbnail" translatable="false">sharedpreference_card_details_show_name_below_thumbnail</string>
     <string name="sharedpreference_card_details_show_note" translatable="false">sharedpreference_card_details_show_note</string>
     <string name="sharedpreference_card_details_show_balance" translatable="false">sharedpreference_card_details_show_balance</string>
     <string name="sharedpreference_card_details_show_validity" translatable="false">sharedpreference_card_details_show_validity</string>
-    <string name="sharedpreference_card_details_show_name_below_thumbnail" translatable="false">sharedpreference_card_details_show_name_below_thumbnail</string>
+    <string name="sharedpreference_card_details_show_archived_cards" translatable="false">sharedpreference_card_details_show_archived_cards</string>
     <string name="settings_category_title_cards">Cards</string>
     <string name="settings_category_title_general">General</string>
     <string name="settings_category_title_privacy">Privacy</string>
+    <string name="action_display_options">Display options</string>
+    <string name="show_archived_cards">Show archived cards</string>
+    <string name="view_online">View online</string>
+    <string name="action_more_options">More options</string>
+    <string name="addWithoutBarcode">Add a card with no barcode</string>
+    <string name="enter_card_id">Enter the ID number or text on your card</string>
+    <string name="card_id_must_not_be_empty">Card ID must not be empty</string>
+    <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>
 </resources>

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

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <locale android:name="en-US" />
+    <locale android:name="ar" />
+    <locale android:name="bg" />
+    <locale android:name="bn" />
+    <locale android:name="bn-IN" />
+    <locale android:name="bs" />
+    <locale android:name="cs" />
+    <locale android:name="da" />
+    <locale android:name="de" />
+    <locale android:name="el-GR" />
+    <locale android:name="eo" />
+    <locale android:name="es" />
+    <locale android:name="es-AR" />
+    <locale android:name="fi" />
+    <locale android:name="fr" />
+    <locale android:name="he-IL" />
+    <locale android:name="hi" />
+    <locale android:name="hr" />
+    <locale android:name="hu" />
+    <locale android:name="in-ID" />
+    <locale android:name="is" />
+    <locale android:name="it" />
+    <locale android:name="ja" />
+    <locale android:name="ko" />
+    <locale android:name="lt" />
+    <locale android:name="lv" />
+    <locale android:name="nb-NO" />
+    <locale android:name="nl" />
+    <locale android:name="oc" />
+    <locale android:name="pl" />
+    <locale android:name="pt" />
+    <locale android:name="ro-RO" />
+    <locale android:name="ru" />
+    <locale android:name="sk" />
+    <locale android:name="sl" />
+    <locale android:name="sv" />
+    <locale android:name="tr" />
+    <locale android:name="uk" />
+    <locale android:name="zh-TW" />
+    <locale android:name="zh-CN" />
+</locale-config>

app/src/screengrab/AndroidManifest.xml

@@ -0,0 +1,17 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- Allows storing screenshots on external storage, where it can be accessed by ADB -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" />
+
+    <!-- Allows changing locales -->
+    <uses-permission
+            android:name="android.permission.CHANGE_CONFIGURATION"
+            tools:ignore="ProtectedPermissions" />
+
+    <!-- Allows changing SystemUI demo mode -->
+    <uses-permission
+            android:name="android.permission.DUMP"
+            tools:ignore="ProtectedPermissions" />
+
+</manifest>

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

@@ -30,72 +30,8 @@ public class BarcodeSelectorActivityTest {
         Activity activity = (Activity) activityController.get();
 
         final TextView cardId = activity.findViewById(R.id.cardId);
-        final Button noBarcodeButton = activity.findViewById(R.id.noBarcode);
 
         // No card ID by default
         assertEquals(cardId.getText().toString(), "");
-
-        // Button should be visible but disabled
-        assertEquals(View.VISIBLE, noBarcodeButton.getVisibility());
-        assertEquals(false, noBarcodeButton.isEnabled());
-    }
-
-    @Test
-    public void nonEmptyStateTest() throws InterruptedException {
-        ActivityController activityController = Robolectric.buildActivity(BarcodeSelectorActivity.class).create();
-        activityController.start();
-        activityController.resume();
-
-        Activity activity = (Activity) activityController.get();
-
-        final TextView cardId = activity.findViewById(R.id.cardId);
-        final Button noBarcodeButton = activity.findViewById(R.id.noBarcode);
-
-        cardId.setText("abcdefg");
-
-        // Run the delayed Handler
-        ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
-
-        // Button should be visible and enabled
-        assertEquals(View.VISIBLE, noBarcodeButton.getVisibility());
-        assertTrue(noBarcodeButton.isEnabled());
-
-        // Clicking button should create "empty" barcode
-        activity.findViewById(R.id.noBarcode).performClick();
-        Intent resultIntent = shadowOf(activity).getResultIntent();
-
-        // The BarcodeSelectorActivity should return an empty string
-        assertEquals("", resultIntent.getStringExtra(BarcodeSelectorActivity.BARCODE_FORMAT));
-        assertEquals("abcdefg", resultIntent.getStringExtra(BarcodeSelectorActivity.BARCODE_CONTENTS));
-    }
-
-    @Test
-    public void nonEmptyToEmptyStateTest() throws InterruptedException {
-        ActivityController activityController = Robolectric.buildActivity(BarcodeSelectorActivity.class).create();
-        activityController.start();
-        activityController.resume();
-
-        Activity activity = (Activity) activityController.get();
-
-        final TextView cardId = activity.findViewById(R.id.cardId);
-        final Button noBarcodeButton = activity.findViewById(R.id.noBarcode);
-
-        cardId.setText("abcdefg");
-
-        // Run the delayed Handler
-        ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
-
-        // Button should be visible and enabled
-        assertEquals(View.VISIBLE, noBarcodeButton.getVisibility());
-        assertTrue(noBarcodeButton.isEnabled());
-
-        cardId.setText("");
-
-        // Run the delayed Handler
-        ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
-
-        // Button should be visible but disabled
-        assertEquals(View.VISIBLE, noBarcodeButton.getVisibility());
-        assertFalse(noBarcodeButton.isEnabled());
     }
 }

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

@@ -18,13 +18,10 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.shadows.ShadowLog;
 
 import java.math.BigDecimal;
-import java.text.DateFormat;
 import java.util.Currency;
-import java.util.Date;
 
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.preference.PreferenceManager;
-import protect.card_locker.preferences.Settings;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -52,7 +49,7 @@ public class LoyaltyCardCursorAdapterTest {
     }
 
     private View createView(Cursor cursor) {
-        LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(activity.getApplicationContext(), cursor, (MainActivity) activity);
+        LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(activity.getApplicationContext(), cursor, (MainActivity) activity, null);
 
         LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder viewHolder = adapter.createViewHolder(activity.findViewById(R.id.list), 0);
         adapter.bindViewHolder(viewHolder, cursor.getPosition());

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

@@ -59,12 +59,11 @@ public class MainActivityTest {
         assertNotNull(menu);
 
         // The settings, import/export, groups, search and add button should be present
-        assertEquals(menu.size(), 8);
+        assertEquals(menu.size(), 7);
         assertEquals("Search", menu.findItem(R.id.action_search).getTitle().toString());
         assertEquals("Sort", menu.findItem(R.id.action_sort).getTitle().toString());
-        assertEquals("Show details", menu.findItem(R.id.action_shown_details).getTitle().toString());
+        assertEquals("Display options", menu.findItem(R.id.action_display_options).getTitle().toString());
         assertEquals("Groups", menu.findItem(R.id.action_manage_groups).getTitle().toString());
-        assertEquals("Archive", menu.findItem(R.id.action_archived).getTitle().toString());
         assertEquals("Import/Export", menu.findItem(R.id.action_import_export).getTitle().toString());
         assertEquals("About", menu.findItem(R.id.action_about).getTitle().toString());
         assertEquals("Settings", menu.findItem(R.id.action_settings).getTitle().toString());

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

@@ -0,0 +1,34 @@
+package protect.card_locker;
+
+import static org.junit.Assert.assertFalse;
+
+import android.content.res.TypedArray;
+import android.graphics.Color;
+
+import androidx.test.core.app.ActivityScenario;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+
+@RunWith(RobolectricTestRunner.class)
+public class UtilsTest {
+    /**
+     * Ensure all the default card colours (used when a user has not chosen a card colour) use white foreground text
+     */
+    @Test
+    public void allDefaultCardColoursHaveWhiteForegroundTest() {
+        try(ActivityScenario<MainActivity> scenario = ActivityScenario.launch(MainActivity.class)) {
+            scenario.onActivity(activity -> {
+                TypedArray colors = activity.getApplicationContext().getResources().obtainTypedArray(R.array.letter_tile_colors);
+
+                for (int i = 0; i < colors.length(); i++) {
+                    // Grab white as fallback so that if the retrieval somehow fails the test is guaranteed to fail because a white background will have black foreground
+                    int color = colors.getColor(i, Color.WHITE);
+                    assertFalse(Utils.needsDarkForeground(color));
+                }
+            });
+        }
+    }
+}

app/src/test/java/protect/card_locker/screenshot/ScreenshotCreation.java

@@ -0,0 +1,31 @@
+package protect.card_locker.screenshot;
+
+import android.support.test.rule.ActivityTestRule;
+
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import protect.card_locker.MainActivity;
+import tools.fastlane.screengrab.Screengrab;
+import tools.fastlane.screengrab.locale.LocaleTestRule;
+
+@RunWith(AndroidJUnit4.class)
+public class ScreenshotCreation {
+    @ClassRule
+    public static final TestRule classRule = new LocaleTestRule();
+
+    @Rule
+    public final ActivityTestRule<MainActivity> activityTestRule = new ActivityTestRule<>(MainActivity.class);
+
+    @Test
+    public void takeScreenshot() throws Exception {
+        Screengrab.screenshot("mainactivity");
+    }
+}