Replace contributors with link

Support HTML in credits screen
2025-12-24 23:57:53 -05:00 · 2024-01-11 22:15:18 +01:00 · 2024-01-11 15:26:07 +01:00
237 changed files with 407 additions and 1020 deletions
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -32,7 +32,7 @@ jobs:
    - uses: actions/checkout@v4.1.1
    - name: Fail on bad translations
      run: if grep -ri "&lt;xliff" app/src/main/res/values*/strings.xml; then echo "Invalidly escaped translations found"; exit 1; fi
-    - uses: gradle/wrapper-validation-action@v2
+    - uses: gradle/wrapper-validation-action@v1
    - name: set up OpenJDK 17
      run: |
        sudo apt-get update
@@ -48,7 +48,7 @@ jobs:
      run: ./gradlew spotbugsRelease
    - name: Archive test results
      if: always()
-      uses: actions/upload-artifact@v4.3.1
+      uses: actions/upload-artifact@v4.0.0
      with:
        name: test-results
        path: app/build/reports
--- a/.github/workflows/changelog-to-fastlane.yml
+++ b/.github/workflows/changelog-to-fastlane.yml
@@ -35,7 +35,7 @@ jobs:
    - name: Run converter script
      run: python .scripts/changelog_to_fastlane.py
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v6.0.0
+      uses: peter-evans/create-pull-request@v5.0.2
      with:
        title: "Update Fastlane changelogs"
        commit-message: "Update Fastlane changelogs"
--- a/.github/workflows/contributors-to-file.yml
+++ b/.github/workflows/contributors-to-file.yml
@@ -1,40 +0,0 @@
-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
-    if: github.ref == 'refs/heads/main'
-    name: Write contributors to file
-    steps:
-    - name: Checkout repo
-      id: checkout
-      uses: actions/checkout@v4.1.1
-    - name: Update contributors
-      id: update_contributors
-      uses: TheLastProject/contributors-to-file-action@v3.2.0
-      with:
-        file_in_repo: app/src/main/res/raw/contributors.txt
-        min_commit_count: 5
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v6.0.0
-      with:
-        title: "Update contributors"
-        commit-message: "Update contributors"
-        branch-suffix: timestamp
--- a/.github/workflows/generate-feature-graphic.yml
+++ b/.github/workflows/generate-feature-graphic.yml
@@ -38,7 +38,7 @@ jobs:
    - name: Generate featureGraphic.png for each language
      run: .scripts/generate_feature_graphic/generate_feature_graphic.sh
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v6.0.0
+      uses: peter-evans/create-pull-request@v5.0.2
      with:
        title: "Update feature graphic"
        commit-message: "Update feature graphic"
--- a/.github/workflows/gradle-update.yml
+++ b/.github/workflows/gradle-update.yml
@@ -24,9 +24,9 @@ jobs:
    - uses: actions/checkout@v4.1.1
    - uses: obfusk/gradle-update-action@v2.0.0
      id: gradle-update
-    - uses: gradle/wrapper-validation-action@v2
+    - uses: gradle/wrapper-validation-action@v1
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v6.0.0
+      uses: peter-evans/create-pull-request@v5.0.2
      with:
        title: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"
        commit-message: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"
--- a/.github/workflows/update-locales.yml
+++ b/.github/workflows/update-locales.yml
@@ -31,7 +31,7 @@ jobs:
    - name: Update locales
      run: .scripts/locales.py
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v6.0.0
+      uses: peter-evans/create-pull-request@v5.0.2
      with:
        title: "Update locales"
        commit-message: "Update locales"
--- a/.scripts/generate_feature_graphic/generate_feature_graphic.sh
+++ b/.scripts/generate_feature_graphic/generate_feature_graphic.sh
@@ -10,9 +10,6 @@ for lang in "$script_location/../../fastlane/metadata/android/"*; do
  if grep -q — title.txt; then
    # Try splitting title.txt on — (em dash)
    IFS='—' read -r appname subtext < title.txt
-  elif grep -q – title.txt; then
-    # No result, try splitting title.txt on – (en dash)
-    IFS='–' read -r appname subtext < title.txt
  else
    # No result, try splitting on - (dash)
    IFS='-' read -r appname subtext < title.txt
@@ -28,7 +25,6 @@ for lang in "$script_location/../../fastlane/metadata/android/"*; do
    # We specifically need the Serif version because of the 200 weight
    case "$(basename "$lang")" in
      bg|el-GR|ru-RU|uk) sed -i "s/Lexend Deca/Noto Serif/" featureGraphic.svg ;;
-      hi-IN) sed -i -e "s/Yesteryear/Noto Serif Devanagari/" -e "s/Lexend Deca/Noto Serif Devanagari/" featureGraphic.svg ;;
      ja-JP) sed -i "s/Lexend Deca/Noto Serif CJK JP/" featureGraphic.svg ;;
      ko) sed -i "s/Lexend Deca/Noto Serif CJK KR/" featureGraphic.svg ;;
      kn-IN) sed -i -e 's/font-size="150"/font-size="100"/' -e 's/y="285.511"/y="235.511"/' featureGraphic.svg ;;
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,6 @@
 # Changelog

-## Unreleased - 133
-
- Target Android 14
- Open card icon in gallery on touch
- Improve design of Photos tab in edit view
-
-## v2.27.0 - 132 (2024-01-30)
+## Unreleased - 132

 - Refine "Add card" workflow
 - Validation flow improvements
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,25 +3,25 @@ GEM
  specs:
    CFPropertyList (3.0.6)
      rexml
-    addressable (2.8.6)
+    addressable (2.8.5)
      public_suffix (>= 2.0.2, < 6.0)
    artifactory (3.0.15)
    atomos (0.1.3)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.884.0)
-    aws-sdk-core (3.191.0)
-      aws-eventstream (~> 1, >= 1.3.0)
+    aws-eventstream (1.2.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.8)
+      aws-sigv4 (~> 1.5)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.77.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-kms (1.71.0)
+      aws-sdk-core (~> 3, >= 3.177.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.143.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-s3 (1.134.0)
+      aws-sdk-core (~> 3, >= 3.181.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sigv4 (1.8.0)
+      aws-sigv4 (~> 1.6)
+    aws-sigv4 (1.6.0)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
    claide (1.1.0)
@@ -32,10 +32,11 @@ GEM
    declarative (0.0.20)
    digest-crc (0.6.5)
      rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.6.20240107)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
    dotenv (2.8.1)
    emoji_regex (3.2.3)
-    excon (0.109.0)
+    excon (0.103.0)
    faraday (1.10.3)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
@@ -64,8 +65,8 @@ GEM
    faraday-retry (1.0.3)
    faraday_middleware (1.2.0)
      faraday (~> 1.0)
-    fastimage (2.3.0)
-    fastlane (2.219.0)
+    fastimage (2.2.7)
+    fastlane (2.215.1)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@@ -84,7 +85,6 @@ GEM
      gh_inspector (>= 1.1.2, < 2.0.0)
      google-apis-androidpublisher_v3 (~> 0.3)
      google-apis-playcustomapp_v1 (~> 0.1)
-      google-cloud-env (>= 1.6.0, < 2.0.0)
      google-cloud-storage (~> 1.31)
      highline (~> 2.0)
      http-cookie (~> 1.0.5)
@@ -93,7 +93,7 @@ GEM
      mini_magick (>= 4.9.4, < 5.0.0)
      multipart-post (>= 2.0.0, < 3.0.0)
      naturally (~> 2.2)
-      optparse (>= 0.1.1)
+      optparse (~> 0.1.1)
      plist (>= 3.1.0, < 4.0.0)
      rubyzip (>= 2.0.0, < 3.0.0)
      security (= 0.1.3)
@@ -107,9 +107,9 @@ GEM
      xcpretty (~> 0.3.0)
      xcpretty-travis-formatter (>= 0.0.3)
    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.54.0)
+    google-apis-androidpublisher_v3 (0.49.0)
      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.3)
+    google-apis-core (0.11.1)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (>= 0.16.2, < 2.a)
      httpclient (>= 2.8.1, < 3.a)
@@ -117,27 +117,28 @@ GEM
      representable (~> 3.0)
      retriable (>= 2.0, < 4.a)
      rexml
+      webrick
    google-apis-iamcredentials_v1 (0.17.0)
      google-apis-core (>= 0.11.0, < 2.a)
    google-apis-playcustomapp_v1 (0.13.0)
      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.31.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.6.1)
-      google-cloud-env (>= 1.0, < 3.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
+    google-cloud-core (1.6.0)
+      google-cloud-env (~> 1.0)
      google-cloud-errors (~> 1.0)
    google-cloud-env (1.6.0)
      faraday (>= 0.17.3, < 3.0)
    google-cloud-errors (1.3.1)
-    google-cloud-storage (1.47.0)
+    google-cloud-storage (1.44.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.31.0)
+      google-apis-storage_v1 (~> 0.19.0)
      google-cloud-core (~> 1.6)
      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (1.8.1)
+    googleauth (1.8.0)
      faraday (>= 0.17.3, < 3.a)
      jwt (>= 1.4, < 3.0)
      multi_json (~> 1.11)
@@ -148,7 +149,7 @@ GEM
      domain_name (~> 0.5)
    httpclient (2.8.3)
    jmespath (1.6.2)
-    json (2.7.1)
+    json (2.6.3)
    jwt (2.7.1)
    mini_magick (4.12.0)
    mini_mime (1.1.5)
@@ -156,11 +157,11 @@ GEM
    multipart-post (2.3.0)
    nanaimo (0.3.0)
    naturally (2.2.1)
-    optparse (0.4.0)
+    optparse (0.1.1)
    os (1.1.4)
-    plist (3.7.1)
-    public_suffix (5.0.4)
-    rake (13.1.0)
+    plist (3.7.0)
+    public_suffix (5.0.3)
+    rake (13.0.6)
    representable (3.2.0)
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -184,13 +185,17 @@ GEM
      unicode-display_width (>= 1.1.1, < 3)
    trailblazer-option (0.1.2)
    tty-cursor (0.7.1)
-    tty-screen (0.8.2)
+    tty-screen (0.8.1)
    tty-spinner (0.9.3)
      tty-cursor (~> 0.7)
    uber (0.1.0)
-    unicode-display_width (2.5.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
+    unicode-display_width (2.4.2)
+    webrick (1.8.1)
    word_wrap (1.0.0)
-    xcodeproj (1.24.0)
+    xcodeproj (1.22.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -15,14 +15,14 @@ spotbugs {

 android {
    namespace = "protect.card_locker"
-    compileSdk = 34
+    compileSdk = 33

    defaultConfig {
        applicationId = "me.hackerchick.catima"
        minSdk = 21
-        targetSdk = 34
-        versionCode = 132
-        versionName = "2.27.0"
+        targetSdk = 33
+        versionCode = 131
+        versionName = "2.26.0"

        vectorDrawables.useSupportLibrary = true
        multiDexEnabled = true
@@ -92,7 +92,7 @@ dependencies {
    implementation("androidx.exifinterface:exifinterface:1.3.7")
    implementation("androidx.palette:palette:1.0.0")
    implementation("androidx.preference:preference:1.2.1")
-    implementation("com.google.android.material:material:1.11.0")
+    implementation("com.google.android.material:material:1.9.0")
    implementation("com.github.yalantis:ucrop:2.2.8")
    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")

@@ -101,7 +101,7 @@ dependencies {

    // Third-party
    implementation("com.journeyapps:zxing-android-embedded:4.3.0@aar")
-    implementation("com.google.zxing:core:3.5.3")
+    implementation("com.google.zxing:core:3.5.2")
    implementation("org.apache.commons:commons-csv:1.9.0")
    implementation("com.jaredrummler:colorpicker:1.1.0")
    implementation("net.lingala.zip4j:zip4j:2.11.5")
--- a/app/src/debug/res/values-de/strings.xml
+++ b/app/src/debug/res/values-de/strings.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Catima Debug</string>
-</resources>
+<resources></resources>
--- a/app/src/debug/res/values/strings.xml
+++ b/app/src/debug/res/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="app_name">Catima Debug</string>
 </resources>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -111,12 +111,10 @@
            android:name=".preferences.SettingsActivity"
            android:label="@string/settings"
            android:theme="@style/AppTheme.NoActionBar" />
-        <!-- FIXME: locked screenOrientation is a workaround for https://github.com/CatimaLoyalty/Android/issues/1715, remove when https://github.com/CatimaLoyalty/Android/issues/513 is fixed -->
        <activity
            android:name=".ImportExportActivity"
            android:label="@string/importExport"
            android:exported="true"
-            android:screenOrientation="locked"
            android:theme="@style/AppTheme.NoActionBar">

            <!-- ZIP Intent Filter -->
--- a/app/src/main/java/protect/card_locker/AboutActivity.java
+++ b/app/src/main/java/protect/card_locker/AboutActivity.java
@@ -12,6 +12,7 @@ import androidx.annotation.StringRes;

 import com.google.android.material.dialog.MaterialAlertDialogBuilder;

+
 import protect.card_locker.databinding.AboutActivityBinding;

 public class AboutActivity extends CatimaAppCompatActivity {
--- a/app/src/main/java/protect/card_locker/AboutContent.java
+++ b/app/src/main/java/protect/card_locker/AboutContent.java
@@ -135,7 +135,7 @@ public class AboutContent {
        contributorInfo.append("<br/><br/>");
        contributorInfo.append(context.getString(R.string.app_copyright_old));
        contributorInfo.append("<br/><br/>");
-        contributorInfo.append(String.format(context.getString(R.string.app_contributors), getContributors()));
+        contributorInfo.append("<a href='https://catima.app/contribute/#existing-contributors'>").append(context.getString(R.string.view_more_contributors)).append("</a>");
        contributorInfo.append("<br/><br/>");
        contributorInfo.append(String.format(context.getString(R.string.app_libraries), getThirdPartyLibraries()));
        contributorInfo.append("<br/><br/>");
--- a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
+++ b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
@@ -12,12 +12,12 @@ import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.Toast;

-import androidx.appcompat.widget.Toolbar;
-
 import com.google.zxing.BarcodeFormat;

 import java.util.ArrayList;

+import androidx.appcompat.widget.Toolbar;
+
 import protect.card_locker.databinding.BarcodeSelectorActivityBinding;

 /**
--- a/app/src/main/java/protect/card_locker/CardsOnPowerScreenService.java
+++ b/app/src/main/java/protect/card_locker/CardsOnPowerScreenService.java
@@ -15,13 +15,13 @@ import android.service.controls.actions.ControlAction;
 import android.service.controls.templates.StatelessTemplate;
 import android.util.Log;

-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
-
 import java.util.List;
 import java.util.concurrent.Flow;
 import java.util.function.Consumer;

+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+
@RequiresApi(Build.VERSION_CODES.R)
 public class CardsOnPowerScreenService extends ControlsProviderService {

--- a/app/src/main/java/protect/card_locker/CatimaAppCompatActivity.java
+++ b/app/src/main/java/protect/card_locker/CatimaAppCompatActivity.java
@@ -14,8 +14,6 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.view.WindowInsetsControllerCompat;

 public class CatimaAppCompatActivity extends AppCompatActivity {
-    protected boolean activityOverridesNavBarColor = false;
-
    @Override
    protected void attachBaseContext(Context base) {
        // Apply chosen language
@@ -50,14 +48,6 @@ public class CatimaAppCompatActivity extends AppCompatActivity {
        Utils.postPatchColors(this);
    }

-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (!activityOverridesNavBarColor) {
-            Utils.setNavigationBarColor(this, null, Utils.resolveBackgroundColor(this), !Utils.isDarkModeEnabled(this));
-        }
-    }
-
    protected void enableToolbarBackButton() {
        ActionBar actionBar = getSupportActionBar();
        if (actionBar != null) {
--- a/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
@@ -8,12 +8,14 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.TextView;

 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;

 import protect.card_locker.databinding.GroupLayoutBinding;
+import protect.card_locker.preferences.Settings;

 public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListItemViewHolder> {
    public final Context mContext;
--- a/app/src/main/java/protect/card_locker/ImportExportActivity.java
+++ b/app/src/main/java/protect/card_locker/ImportExportActivity.java
@@ -1,8 +1,10 @@
 package protect.card_locker;

+import android.Manifest;
 import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.InputType;
@@ -14,20 +16,23 @@ import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.Toast;

-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;

+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import protect.card_locker.async.TaskHandler;
 import protect.card_locker.databinding.ImportExportActivityBinding;
 import protect.card_locker.importexport.DataFormat;
--- a/app/src/main/java/protect/card_locker/LoyaltyCard.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCard.java
@@ -4,13 +4,13 @@ import android.database.Cursor;
 import android.os.Parcel;
 import android.os.Parcelable;

-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import java.math.BigDecimal;
 import java.util.Currency;
 import java.util.Date;

+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 public class LoyaltyCard implements Parcelable {
    public final int id;
    public final String store;
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -15,13 +15,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;

-import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.BlendModeColorFilterCompat;
-import androidx.core.graphics.BlendModeCompat;
-import androidx.recyclerview.widget.RecyclerView;
-
 import com.google.android.material.card.MaterialCardView;
 import com.google.android.material.color.MaterialColors;

@@ -29,6 +22,13 @@ import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.util.ArrayList;

+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.BlendModeColorFilterCompat;
+import androidx.core.graphics.BlendModeCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 import protect.card_locker.databinding.LoyaltyCardLayoutBinding;

 public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder> {
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -777,7 +777,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements

    @SuppressLint("DefaultLocale")
    @Override
-    protected void onResume() {
+    public void onResume() {
        super.onResume();

        Log.i(TAG, "To view card: " + loyaltyCardId);
--- a/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java
@@ -3,7 +3,6 @@ package protect.card_locker;
 import android.app.Application;

 import androidx.appcompat.app.AppCompatDelegate;
-
 import protect.card_locker.preferences.Settings;

 public class LoyaltyCardLockerApplication extends Application {
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -47,6 +47,7 @@ import androidx.core.graphics.BlendModeColorFilterCompat;
 import androidx.core.graphics.BlendModeCompat;
 import androidx.core.graphics.ColorUtils;
 import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsControllerCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;

 import com.google.android.material.color.MaterialColors;
@@ -109,25 +110,22 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            return;
        }

-        ImageType imageType = imageTypes.get(mainImageIndex);
-
        // If the barcode is shown, switch to fullscreen layout
-        if (imageType == ImageType.BARCODE) {
+        if (imageTypes.get(mainImageIndex) == ImageType.BARCODE) {
            setFullscreen(true);
            return;
        }

        // If this is an image, open it in the gallery.
-        openImageInGallery(imageType);
+        openCurrentMainImageInGallery();
    }

-    private void openImageInGallery(ImageType imageType) {
+    private void openCurrentMainImageInGallery() {
+        ImageType wantedImageType = imageTypes.get(mainImageIndex);
+
        File file = null;

-        switch (imageType) {
-            case ICON:
-                file = Utils.retrieveCardImageAsFile(this, loyaltyCardId, ImageLocationType.icon);
-                break;
+        switch (wantedImageType) {
            case IMAGE_FRONT:
                file = Utils.retrieveCardImageAsFile(this, loyaltyCardId, ImageLocationType.front);
                break;
@@ -175,7 +173,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements

    enum ImageType {
        NONE,
-        ICON,
        BARCODE,
        IMAGE_FRONT,
        IMAGE_BACK
@@ -303,13 +300,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        binding.bottomAppBarNextButton.setOnClickListener(view -> prevNextCard(true));
        binding.bottomAppBarUpdateBalanceButton.setOnClickListener(view -> showBalanceUpdateDialog());

-        binding.iconContainer.setOnClickListener(view -> {
-            if (Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon) != null) {
-                openImageInGallery(ImageType.ICON);
-            } else {
-                Toast.makeText(LoyaltyCardViewActivity.this, R.string.icon_header_click_text, Toast.LENGTH_LONG).show();
-            }
-        });
+        binding.iconContainer.setOnClickListener(view -> Toast.makeText(LoyaltyCardViewActivity.this, R.string.icon_header_click_text, Toast.LENGTH_LONG).show());
        binding.iconContainer.setOnLongClickListener(view -> {
            Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
            Bundle bundle = new Bundle();
@@ -564,8 +555,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements


    @Override
-    protected void onResume() {
-        activityOverridesNavBarColor = true;
+    public void onResume() {
        super.onResume();

        Log.i(TAG, "To view card: " + loyaltyCardId);
@@ -646,7 +636,11 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements

        // Set bottomAppBar and system navigation bar color
        binding.bottomAppBar.setBackgroundColor(darkenedColor);
-        Utils.setNavigationBarColor(null, window, darkenedColor, Utils.needsDarkForeground(darkenedColor));
+        if (window != null && Build.VERSION.SDK_INT >= 27) {
+            WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(window, binding.getRoot());
+            wic.setAppearanceLightNavigationBars(Utils.needsDarkForeground(darkenedColor));
+            window.setNavigationBarColor(darkenedColor);
+        }

        int complementaryColor = Utils.getComplementaryColor(darkenedColor);
        binding.fabEdit.setBackgroundTintList(ColorStateList.valueOf(complementaryColor));
--- a/app/src/main/java/protect/card_locker/ManageGroupActivity.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupActivity.java
@@ -13,12 +13,6 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;

-import androidx.activity.OnBackPressedCallback;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.RecyclerView;
-
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;

@@ -26,6 +20,12 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;

+import androidx.activity.OnBackPressedCallback;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.RecyclerView;
+
 import protect.card_locker.databinding.ActivityManageGroupBinding;

 public class ManageGroupActivity extends CatimaAppCompatActivity implements ManageGroupCursorAdapter.CardAdapterListener {
--- a/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
@@ -14,17 +14,17 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;

+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import java.util.List;
+
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
-import java.util.List;
-
 import protect.card_locker.databinding.ManageGroupsActivityBinding;

 public class ManageGroupsActivity extends CatimaAppCompatActivity implements GroupCursorAdapter.GroupAdapterListener {
--- a/app/src/main/java/protect/card_locker/ScanActivity.java
+++ b/app/src/main/java/protect/card_locker/ScanActivity.java
@@ -32,6 +32,7 @@ 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;
@@ -343,21 +344,13 @@ public class ScanActivity extends CatimaAppCompatActivity {
    }

    public void addManually() {
-        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ScanActivity.this);
-        builder.setTitle(R.string.add_manually_warning_title);
-        builder.setMessage(R.string.add_manually_warning_message);
-        builder.setPositiveButton(R.string.continue_, (dialog, which) -> {
-            Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
-            if (cardId != null) {
-                final Bundle b = new Bundle();
-                b.putString("initialCardId", cardId);
-                i.putExtras(b);
-            }
-            manualAddLauncher.launch(i);
-        });
-        builder.setNegativeButton(R.string.cancel, (dialog, which) -> setScannerActive(true));
-        builder.setOnCancelListener(dialog -> setScannerActive(true));
-        builder.show();
+        Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
+        if (cardId != null) {
+            final Bundle b = new Bundle();
+            b.putString("initialCardId", cardId);
+            i.putExtras(b);
+        }
+        manualAddLauncher.launch(i);
    }

    public void addFromImage() {
--- a/app/src/main/java/protect/card_locker/ShortcutHelper.java
+++ b/app/src/main/java/protect/card_locker/ShortcutHelper.java
@@ -8,11 +8,6 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.os.Bundle;

-import androidx.core.content.pm.ShortcutInfoCompat;
-import androidx.core.content.pm.ShortcutManagerCompat;
-import androidx.core.graphics.ColorUtils;
-import androidx.core.graphics.drawable.IconCompat;
-
 import org.jetbrains.annotations.NotNull;

 import java.util.Collections;
@@ -20,6 +15,11 @@ import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;

+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
+import androidx.core.graphics.ColorUtils;
+import androidx.core.graphics.drawable.IconCompat;
+
 class ShortcutHelper {
    // Android documentation says that no more than 5 shortcuts
    // are supported. However, that may be too many, as not all
--- a/app/src/main/java/protect/card_locker/UCropWrapper.java
+++ b/app/src/main/java/protect/card_locker/UCropWrapper.java
@@ -11,16 +11,16 @@ import android.view.Window;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;

+import com.google.android.material.color.MaterialColors;
+import com.google.android.material.textview.MaterialTextView;
+import com.yalantis.ucrop.UCropActivity;
+
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.ColorUtils;
 import androidx.core.view.WindowInsetsControllerCompat;

-import com.google.android.material.color.MaterialColors;
-import com.google.android.material.textview.MaterialTextView;
-import com.yalantis.ucrop.UCropActivity;
-
 public class UCropWrapper extends UCropActivity {
    public static final String UCROP_TOOLBAR_TYPEFACE_STYLE = "ucop_toolbar_typeface_style";

--- a/app/src/main/java/protect/card_locker/Utils.java
+++ b/app/src/main/java/protect/card_locker/Utils.java
@@ -28,7 +28,6 @@ import android.widget.TextView;
 import android.widget.Toast;

 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.RawRes;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
@@ -666,33 +665,25 @@ public class Utils {
        }
    }

-    // Force correct color
-    // Fixes OLED dark mode in MainActivity
+    // XXX android 9 and below has issues with patched theme where the background becomes a
+    // rendering mess
+    // use after views are inflated
    public static void postPatchColors(AppCompatActivity activity) {
-        activity.findViewById(android.R.id.content).setBackgroundColor(resolveBackgroundColor(activity));
-    }
+        TypedValue typedValue = new TypedValue();
+        activity.getTheme().resolveAttribute(android.R.attr.colorBackground, typedValue, true);
+        activity.findViewById(android.R.id.content).setBackgroundColor(typedValue.data);

-    // Either pass an Activity on which to call getWindow() or an existing Window (may be null) returned by that function.
-    public static void setNavigationBarColor(@Nullable AppCompatActivity activity, @Nullable Window window, int color, boolean useLightBars) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-            if (window == null && activity != null) {
-                window = activity.getWindow();
-            }
+        if (Build.VERSION.SDK_INT >= 27) {
+            Window window = activity.getWindow();
            if (window != null) {
                View decorView = window.getDecorView();
                WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(window, decorView);
-                wic.setAppearanceLightNavigationBars(useLightBars);
-                window.setNavigationBarColor(color);
+                wic.setAppearanceLightNavigationBars(!isDarkModeEnabled(activity));
+                window.setNavigationBarColor(typedValue.data);
            }
        }
    }

-    public static int resolveBackgroundColor(AppCompatActivity activity) {
-        TypedValue typedValue = new TypedValue();
-        activity.getTheme().resolveAttribute(android.R.attr.colorBackground, typedValue, true);
-        return typedValue.data;
-    }
-
    public static int getHeaderColorFromImage(Bitmap image, int fallback) {
        if (image == null) {
            return fallback;
--- a/app/src/main/java/protect/card_locker/preferences/Settings.java
+++ b/app/src/main/java/protect/card_locker/preferences/Settings.java
@@ -3,13 +3,12 @@ package protect.card_locker.preferences;
 import android.content.Context;
 import android.content.SharedPreferences;

+import java.util.Locale;
+
 import androidx.annotation.IntegerRes;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.preference.PreferenceManager;
-
-import java.util.Locale;
-
 import protect.card_locker.R;
 import protect.card_locker.Utils;

--- a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
+++ b/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
@@ -1,5 +1,6 @@
 package protect.card_locker.preferences;

+
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -369,106 +369,75 @@
                android:visibility="gone"
                tools:visibility="visible">

+                <!-- Front image -->
                <LinearLayout
+                    android:id="@+id/frontImageHolder"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:orientation="horizontal"
-                    android:baselineAligned="false">
+                    android:paddingHorizontal="@dimen/inputPadding"
+                    android:paddingTop="@dimen/inputPadding">

                    <!-- Front image -->
                    <com.google.android.material.card.MaterialCardView
-                        android:id="@+id/frontImageHolder"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
+                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:layout_margin="5dp"
-                        style="?attr/materialCardViewElevatedStyle">
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="@dimen/activity_margin"
+                        android:layout_marginTop="@dimen/activity_margin"
+                        android:layout_marginEnd="@dimen/activity_margin"
+                        android:layout_marginBottom="@dimen/activity_margin"
+                        android:paddingHorizontal="@dimen/inputPadding"
+                        app:cardCornerRadius="4dp"
+                        app:cardElevation="0dp">

-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/frontImageConstraint"
+                        <ImageView
+                            android:id="@+id/frontImage"
                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:adjustViewBounds="true"
+                            android:minHeight="50dp"
+                            android:contentDescription="@string/frontImageDescription"
+                            android:scaleType="fitCenter"
+                            app:srcCompat="@drawable/ic_camera_white"
+                            android:background="?attr/colorPrimary" />

-                            <!-- Back image -->
-                            <ImageView
-                                android:id="@+id/frontImage"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:adjustViewBounds="true"
-                                android:minHeight="50dp"
-                                android:contentDescription="@string/backImageDescription"
-                                android:scaleType="fitCenter"
-                                app:srcCompat="@drawable/ic_camera_white"
-                                android:background="?attr/colorPrimary"
-                                app:layout_constraintBottom_toTopOf="@id/frontImageDescription"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <TextView
-                                android:id="@+id/frontImageDescription"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:layout_marginEnd="8dp"
-                                android:layout_marginBottom="4dp"
-                                android:text="@string/frontImageDescription"
-                                android:textAppearance="?attr/textAppearanceHeadlineSmall"
-                                android:gravity="center"
-                                app:layout_constraintTop_toBottomOf="@id/frontImage"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"/>
-                        </androidx.constraintlayout.widget.ConstraintLayout>
                    </com.google.android.material.card.MaterialCardView>
+                </LinearLayout>
+
+                <!-- Back image -->
+                <LinearLayout
+                    android:id="@+id/backImageHolder"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:paddingHorizontal="@dimen/inputPadding"
+                    android:paddingTop="@dimen/inputPadding">

                    <!-- Back image -->
                    <com.google.android.material.card.MaterialCardView
-                        android:layout_weight="1"
-                        android:id="@+id/backImageHolder"
-                        android:layout_width="0dp"
+                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:layout_margin="5dp"
-                        style="?attr/materialCardViewElevatedStyle">
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="@dimen/activity_margin"
+                        android:layout_marginTop="@dimen/activity_margin"
+                        android:layout_marginEnd="@dimen/activity_margin"
+                        android:layout_marginBottom="@dimen/activity_margin"
+                        android:paddingHorizontal="@dimen/inputPadding"
+                        app:cardCornerRadius="4dp"
+                        app:cardElevation="0dp">

-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/backImageConstraint"
+                        <ImageView
+                            android:id="@+id/backImage"
                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:adjustViewBounds="true"
+                            android:minHeight="50dp"
+                            android:contentDescription="@string/backImageDescription"
+                            android:scaleType="fitCenter"
+                            app:srcCompat="@drawable/ic_camera_white"
+                            android:background="?attr/colorPrimary" />

-                            <!-- Back image -->
-                            <ImageView
-                                android:id="@+id/backImage"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:adjustViewBounds="true"
-                                android:minHeight="50dp"
-                                android:contentDescription="@string/backImageDescription"
-                                android:scaleType="fitCenter"
-                                app:srcCompat="@drawable/ic_camera_white"
-                                android:background="?attr/colorPrimary"
-                                app:layout_constraintBottom_toTopOf="@id/backImageDescription"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <TextView
-                                android:id="@+id/backImageDescription"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:layout_marginEnd="8dp"
-                                android:layout_marginBottom="4dp"
-                                android:text="@string/backImageDescription"
-                                android:textAppearance="?attr/textAppearanceHeadlineSmall"
-                                android:gravity="center"
-                                app:layout_constraintTop_toBottomOf="@id/backImage"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"/>
-                        </androidx.constraintlayout.widget.ConstraintLayout>
                    </com.google.android.material.card.MaterialCardView>
                </LinearLayout>
            </TableLayout>
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/coordinator_layout"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
--- a/app/src/main/res/layout/settings_activity.xml
+++ b/app/src/main/res/layout/settings_activity.xml
@@ -1,5 +1,6 @@
 <?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"
--- a/app/src/main/res/raw/contributors.txt
+++ b/app/src/main/res/raw/contributors.txt
@@ -1,56 +0,0 @@
-Sylvia van Os
-Branden Archer
-J. Lavoie
-Allan Nordhøy
-solokot
-Heimen Stoffels
-FC (Fay) Stegerman
-Oğuz Ersen
-Katharine Chui
-SlavekB
-StoyanDimitrov
-mondstern
-IllusiveMan196
-Altonss
-Michael Moroni
-GM
-Eric
-Petr Novák
-Joel A
-laralem
-Taco
-pfaffenrodt
-Aayush Gupta
-HudobniVolk
-Nyatsuki
-Samantaz Fox
-arno-github
-Cliff Heraldo
-Sergio Paredes
-Ankit Tiwari
-Milan Šalka
-Jiri Grönroos
-Balázs Meskó
-Giovanni Donisi
-Milo Ivir
-Skrripy
-huuhaa
-Projjal Moitra
-Quentin PAGÈS
-waffshappen
-Eryk Michalak
-Ziad OUALHADJ
-Robin Liu
-mdvhimself
-Denis Shilin
-Miha Frangež
-Silvério Santos
-ikanakova
-Virginie
-Michael Gangolf
-rudy3
-Kim Seohyun
-Govind S Nair
-Freddo espresso
-arshbeerSingh
-Alexander Ivanov
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -121,7 +121,6 @@
    <string name="settings_green_theme">أخضر</string>
    <string name="settings_grey_theme">رمادي</string>
    <string name="settings_brown_theme">بني</string>
-    <string name="app_contributors">أصبح ممكنًا بواسطة: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="sort">فرز</string>
    <string name="showMoreInfo">اظهر المعلومات</string>
    <string name="reverse">... بترتيب معكوس</string>
@@ -311,5 +310,4 @@
    <string name="addWithoutBarcode">إضافة بدون باركود</string>
    <string name="field_must_not_be_empty">يجب ألا يكون الحقل فارغا</string>
    <string name="app_name">كاتيما</string>
-    <string name="settings_follow_sensor_orientation">التدوير دائمًا ( تجاهل إعدادات النظام)</string>
 </resources>
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
    <string name="storeName">Nome</string>
    <string name="note">Nota</string>
    <string name="noMatchingGiftCards">Nun hai nengún resultáu. Prueba a camudar la busca.</string>
@@ -24,6 +24,10 @@
    <string name="save">Guardar</string>
    <string name="edit">Editar</string>
    <string name="delete">Desaniciar</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one"></item>
+        <item quantity="other"></item>
+    </plurals>
    <string name="unstar">Quitar de Favoritos</string>
    <string name="cancel">Encaboxar</string>
    <string name="importFailed">Nun se pudo facer la importación</string>
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -155,7 +155,6 @@
        <item quantity="one">Желаете ли <xliff:g>%d</xliff:g> карта да бъде премахната\?</item>
        <item quantity="other">Желаете ли тези <xliff:g>%d</xliff:g> карти да бъдат премахнати\?</item>
    </plurals>
-    <string name="app_contributors">Осъществено от: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="settings_brown_theme">Кафяво</string>
    <string name="settings_grey_theme">Сиво</string>
    <string name="settings_green_theme">Зелено</string>
@@ -283,5 +282,4 @@
    <string name="addWithoutBarcode">Добавяне на карта без щрихкод</string>
    <string name="field_must_not_be_empty">Полето не трябва да е празно</string>
    <string name="app_name">Catima</string>
-    <string name="settings_follow_sensor_orientation">Винаги да се завърта (пренебрегва системната настройка)</string>
 </resources>
--- a/app/src/main/res/values-bn-rIN/strings.xml
+++ b/app/src/main/res/values-bn-rIN/strings.xml
@@ -207,7 +207,6 @@
    <string name="credits">ক্রেডিট</string>
    <string name="help_translate_this_app">এই অ্যাপটি অনুবাদ করতে সাহায্য করুন</string>
    <string name="showMoreInfo">তথ্য দেখান</string>
-    <string name="app_contributors">এর দ্বারা সম্ভব হয়েছে: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="importCards">কার্ড আমদানি করুন</string>
    <string name="importFidmeMessage">FidMe থেকে আমদানি করতে আপনার <i>fidme-export-request-xxxxxx.zip</i> রপ্তানি নির্বাচন করুন এবং পরে বারকোডের ধরন ম্যানুয়ালি নির্বাচন করুন।
 \nআপনার FidMe প্রোফাইল থেকে ডেটা সুরক্ষা নির্বাচন করে এবং তারপর প্রথমে আমার ডেটা বের করুন টিপে এটি তৈরি করুন।</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -170,7 +170,6 @@
        <item quantity="few">Vybrány <xliff:g>%d</xliff:g> karty</item>
        <item quantity="other">Vybráno <xliff:g>%d</xliff:g> karet</item>
    </plurals>
-    <string name="app_contributors">Přispěli: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="noGroupCards">Tato skupina je prázdná</string>
    <string name="sort_by">Seřadit podle</string>
    <string name="reverse">…v obráceném pořadí</string>
@@ -290,5 +289,4 @@
    <string name="addWithoutBarcode">Přidat kartu bez čárového kódu</string>
    <string name="field_must_not_be_empty">Položka nesmí být prázdná</string>
    <string name="app_name">Catima</string>
-    <string name="settings_follow_sensor_orientation">Vždy otáčet (ignoruje nastavení systému)</string>
 </resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -132,8 +132,8 @@
    <string name="setBackImage">Kartenrückseite</string>
    <string name="setFrontImage">Kartenvorderseite</string>
    <string name="photos">Fotos</string>
-    <string name="frontImageDescription">Bild der Vorseite</string>
-    <string name="backImageDescription">Bild der Rückseite</string>
+    <string name="frontImageDescription">Bild auf der Vorseite</string>
+    <string name="backImageDescription">Bild auf der Rückseite</string>
    <string name="passwordRequired">Bitte gib das Passwort ein</string>
    <string name="importStocardMessage">Wähle deinen <i>***.zip</i>-Export aus Stocard zum Importieren aus.
 \nSie erhalten ihn, indem du eine E-Mail an support@stocardapp.com sendest und um einen Export deiner Daten bitten.</string>
@@ -167,14 +167,13 @@
    <string name="settings_pink_theme">Rosa</string>
    <string name="settings_catima_theme">Catima</string>
    <string name="settings_theme_color">Designfarbe</string>
-    <string name="app_contributors">Ermöglicht durch: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="barcodeImageDescriptionWithType">Bild <xliff:g>%s</xliff:g> Barcode</string>
    <string name="sort_by">Sortieren nach</string>
    <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>
-    <string name="reverse">…in umgekehrter Reihenfolge</string>
+    <string name="reverse">… in umgekehrter Reihenfolge</string>
    <string name="version_history">Versionshistorie</string>
    <string name="credits">Dank an</string>
    <string name="help_translate_this_app">Hilfe bei der Übersetzung</string>
@@ -193,7 +192,7 @@
    <string name="editGroup">Gruppe wird bearbeitet: <xliff:g>%s</xliff:g></string>
    <string name="group_edit">Gruppe bearbeiten</string>
    <string name="noGiftCardsGroup">Erstelle einige Karten und ordne sie dann hier der Gruppe zu.</string>
-    <string name="setIcon">Vorschaubild setzen</string>
+    <string name="setIcon">Vorschau setzen</string>
    <string name="selectColor">Farbe auswählen</string>
    <string name="translate_platform">auf Weblate</string>
    <string name="shortcutSelectCard">Wählen Sie eine Karte</string>
@@ -205,14 +204,14 @@
        <item quantity="other"><xliff:g>%s</xliff:g> Punkte</item>
    </plurals>
    <string name="settings_oled_dark">Komplett schwarzer Hintergrund im dunklen Design</string>
-    <string name="include_if_asking_support">Wenn Du Unterstützung haben möchtest, gib bitte folgende Informationen an:</string>
+    <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">Querformat</string>
-    <string name="settings_portrait_orientation">Hochformat</string>
+    <string name="settings_landscape_orientation">Landschaft</string>
+    <string name="settings_portrait_orientation">Porträt</string>
    <string name="duplicateCard">Duplizieren</string>
    <string name="unarchive">Archivierung aufheben</string>
    <string name="settings_card_orientation">Barcode-Ausrichtung</string>
-    <string name="unarchived">Karte aus dem Archiv entfernt</string>
+    <string name="unarchived">Karte nicht archiviert</string>
    <string name="archive">Archivieren</string>
    <string name="archived">Karte archiviert</string>
    <string name="settings_lock_on_opening_orientation">Kartenausrichtung nach dem Öffnen beibehalten</string>
@@ -223,7 +222,7 @@
    <string name="failedLaunchingPhotoPicker">Es konnte keine unterstützte Galerie-Anwendung gefunden werden</string>
    <string name="previousCard">Vorherige</string>
    <string name="nextCard">Nächste</string>
-    <string name="failedToOpenUrl">Bitte installiere einen Webbrowser</string>
+    <string name="failedToOpenUrl">Installieren Sie zunächst einen Webbrowser</string>
    <plurals name="viewArchivedCardsWithCount">
        <item quantity="one">Archiv ansehen (<xliff:g>%1$d</xliff:g> Karte)</item>
        <item quantity="other">Archiv ansehen (<xliff:g>%1$d</xliff:g> Karten)</item>
@@ -239,8 +238,8 @@
    <string name="currentBalanceSentence">Aktuelles Guthaben: <xliff:g>%s</xliff:g></string>
    <string name="newBalanceSentence">Neues Guthaben: <xliff:g>%s</xliff:g></string>
    <string name="updateBalance">Guthaben aktualisieren</string>
-    <string name="storageReadPermissionRequired">Berechtigung zum Lesen des Speichers für diese Aktion erforderlich…</string>
-    <string name="cameraPermissionRequired">Für diese Aktion wird die Erlaubnis zum Zugriff auf die Kamera benötigt…</string>
+    <string name="storageReadPermissionRequired">Berechtigung zum Lesen des Speichers für diese Aktion erforderlich …</string>
+    <string name="cameraPermissionRequired">Für diese Aktion wird die Erlaubnis zum Zugriff auf die Kamera benötigt …</string>
    <string name="validFromDate">Gültig ab</string>
    <string name="validFromSentence">Gültig ab: <xliff:g>%s</xliff:g></string>
    <string name="chooseValidFromDate">Gültig-ab-Datum wählen</string>
@@ -283,5 +282,4 @@
    <string name="field_must_not_be_empty">Feld darf nicht leer sein</string>
    <string name="manually_enter_barcode_instructions">Trage die ID Nummer oder Text deiner Karte ein und drücke auf den Barcode, der wie auf deiner Karte aussieht.</string>
    <string name="app_name">Catima</string>
-    <string name="settings_follow_sensor_orientation">Immer drehen (ignoriert Systemeinstellungen)</string>
 </resources>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -212,7 +212,6 @@
    <string name="settings_magenta_theme">Φούξια</string>
    <string name="settings_violet_theme">Βιολετί</string>
    <string name="settings_blue_theme">Μπλε</string>
-    <string name="app_contributors">Δημιουργήθηκε από: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="showMoreInfo">Εμφάνιση πληροφοριών</string>
    <string name="sort_by_name">Όνομα</string>
    <string name="and_data_usage">και δεδομένα χρήσης</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -159,7 +159,6 @@
        <item quantity="many">Borrar <xliff:g>%d</xliff:g> tarjetas</item>
        <item quantity="other">Borrar <xliff:g>%d</xliff:g> tarjetas</item>
    </plurals>
-    <string name="app_contributors">Hecho posible por: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="settings_brown_theme">Marrón</string>
    <string name="settings_grey_theme">Gris</string>
    <string name="settings_green_theme">Verde</string>
@@ -290,5 +289,4 @@
    <string name="addWithoutBarcode">Añadir una tarjeta sin código de barras</string>
    <string name="field_must_not_be_empty">Este campo no debe estar vacío</string>
    <string name="app_name">Catima</string>
-    <string name="settings_follow_sensor_orientation">Girar siempre (ignora la configuración del sistema)</string>
 </resources>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -155,7 +155,6 @@
    <string name="failedGeneratingShareURL">Jaettavaa URL-osoitetta ei voitu luoda. Ilmoita tästä.</string>
    <string name="turn_flashlight_on">Käytä taskulamppua</string>
    <string name="turn_flashlight_off">Sammuta salamavalo</string>
-    <string name="app_contributors">Mahdollistanut: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="settings_brown_theme">Ruskea</string>
    <string name="settings_grey_theme">Harmaa</string>
    <string name="settings_green_theme">Vihreä</string>
@@ -281,7 +280,4 @@
    <string name="field_must_not_be_empty">Kenttä ei saa olla tyhjä</string>
    <string name="manually_enter_barcode_instructions">Syötä kortissa näkyvä numero tai teksti ja klikkaa viivakoodia, joka vastaa kortissa olevaa koodia.</string>
    <string name="app_name">Catima</string>
-    <string name="balanceParsingFailed">Virheellinen saldo</string>
-    <string name="view_online">Näytä verkossa</string>
-    <string name="settings_follow_sensor_orientation">Kierrä aina (ohittaa järjestelmän asetukset)</string>
 </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -95,9 +95,9 @@
    <string name="expiryDate">Date d’expiration</string>
    <string name="editBarcode">Modifier le code-barres</string>
    <string name="card">Carte</string>
-    <string name="balanceSentence">Solde : <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentenceExpired">Expiré le : <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentence">Expire le : <xliff:g>%s</xliff:g></string>
+    <string name="balanceSentence">Solde : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Expiré : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="expiryStateSentence">Expire : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
    <string name="settings_disable_lockscreen_while_viewing_card">Empêcher le verrouillage de l’écran</string>
    <string name="settings_keep_screen_on">Garder l’écran allumé</string>
    <string name="importVoucherVaultMessage">Sélectionnez votre exportation <i>vouchervault.json</i> de Voucher Vault à importer.
@@ -170,7 +170,6 @@
    <string name="settings_pink_theme">Rose</string>
    <string name="settings_catima_theme">Catima</string>
    <string name="settings_theme_color">Couleur du thème</string>
-    <string name="app_contributors">Rendu possible par : <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="noGroupCards">Ce groupe est vide</string>
    <string name="barcodeImageDescriptionWithType">Image <xliff:g>%s</xliff:g> code-barres</string>
    <string name="sort">Trier</string>
@@ -290,5 +289,4 @@
    <string name="addWithoutBarcode">Ajouter une carte sans code-barres</string>
    <string name="field_must_not_be_empty">Le champ ne peut pas être vide</string>
    <string name="app_name">Catima</string>
-    <string name="settings_follow_sensor_orientation">Toujours pivoter (ignore les paramètres du système)</string>
 </resources>
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -70,7 +70,7 @@
    <string name="noBarcode">बारकोड नहीं है</string>
    <string name="scanCardBarcode">बारकोड स्कैन करें</string>
    <string name="cardShortcut">कार्ड का सरल उपाय (शॉर्टकट)</string>
-    <string name="noGiftCards">कार्ड जोड़ने के लिए + प्लस बटन पर क्लिक करें, या ⋮ मेनू से आयात करें।</string>
+    <string name="noGiftCards">\"+\" बटन दबाके कार्ड जोड़ें वा मेन्यू से कार्ड आयात करें</string>
    <string name="importExportHelp">तथ्य (डाटा) को बैकअप करना हमें उसे दूसरे डिवाइस में भेजने देता है।</string>
    <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> का बारकोड</string>
    <string name="settings_disable_lockscreen_while_viewing_card">स्क्रीन को लॉक होने से रोकें</string>
@@ -107,7 +107,7 @@
    <string name="exportSuccessful">डेटा निर्यात किया गया</string>
    <string name="groupsList">समूह: <xliff:g>%s</xliff:g></string>
    <plurals name="balancePoints">
-        <item quantity="one"><xliff:g>%s</xliff:g> बिंदु</item>
+        <item quantity="one"><xliff:g>%s</xliff:g> अंक</item>
        <item quantity="other"><xliff:g>%s</xliff:g> अंक</item>
    </plurals>
    <string name="privacy_policy_popup_text">निजता नीति नोटिस (कुछ ऐप स्टोर के लिए आवश्यक):
@@ -117,7 +117,7 @@
 \nदूसरे Catima ऍप के आयात/निर्यात मेनू से निर्यात बटन दबाकर, पहले catima.zip फाइल को बनाये.</string>
    <plurals name="selectedCardCount">
        <item quantity="one"><xliff:g>%d</xliff:g> चयनित</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> चयनित</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> चयनित.</item>
    </plurals>
    <string name="groups">समूहों</string>
    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">कॉपीराइट © 2019–<xliff:g>%d</xliff:g> Sylvia van Os और योगदाता</string>
@@ -214,74 +214,4 @@
    <string name="show_balance">मात्रा दिखाओ</string>
    <string name="nextCard">अगला</string>
    <string name="rate_this_app">इस ऐप को रेट करें</string>
-    <string name="settings_system_locale">सिस्टम</string>
-    <string name="setIcon">थंबनेल सेट करें</string>
-    <string name="sort_by_expiry">समाप्ति</string>
-    <string name="sort_by">इसके अनुसार क्रमबद्ध करें</string>
-    <string name="importCards">कार्ड आयात करें</string>
-    <string name="add_a_card_in_a_different_way">कार्ड को भिन्न तरीके से जोड़ें</string>
-    <string name="settings_locale">भाषा</string>
-    <string name="settings_oled_dark">गहरे रंग की थीम के लिए शुद्ध काले रंग की पृष्ठभूमि</string>
-    <string name="selectColor">रंग चुनो</string>
-    <string name="app_contributors">इसके द्वारा संभव बनाया गया: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="sort">क्रमबद्ध करें</string>
-    <string name="show_note">नोट दिखाएँ</string>
-    <string name="settings_follow_sensor_orientation">हमेशा घुमाएँ (सिस्टम सेटिंग्स को अनदेखा करता है)</string>
-    <string name="importFidmeMessage">आयात करने के लिए FidMe से अपना <i>fidme-export-request-xxxxxx.zip</i> निर्यात चुनें, और बाद में मैन्युअल रूप से बारकोड प्रकार चुनें।
-\nडेटा सुरक्षा चुनकर और फिर पहले मेरा डेटा निकालें दबाकर इसे अपनी FidMe प्रोफ़ाइल से बनाएं।</string>
-    <string name="importLoyaltyCardKeychainMessage">आयात करने के लिए लॉयल्टी कार्ड कीचेन से अपना <i>LoyaltyCardKeychen.csv</i> निर्यात चुनें।
-\nपहले वहां एक्सपोर्ट दबाकर लॉयल्टी कार्ड कीचेन में आयात/निर्यात मेनू से इसे बनाएं।</string>
-    <string name="updateBarcodeQuestionText">आपने आईडी बदल दी. क्या आप समान मान का उपयोग करने के लिए बारकोड को भी अपडेट करना चाहते हैं?</string>
-    <string name="exportPassword">अपने निर्यात की सुरक्षा के लिए एक पासवर्ड सेट करें (वैकल्पिक)</string>
-    <string name="turn_flashlight_off">टॉर्च बंद करें</string>
-    <string name="settings_oled_dark_summary">OLED डिस्प्ले पर बैटरी का उपयोग कम होता है</string>
-    <string name="showMoreInfo">जानकारी दिखाएँ</string>
-    <string name="updateBalance">शेष राशि अद्यतन करें</string>
-    <string name="failedToRetrieveImageFile">छवि फ़ाइल पुनः प्राप्त करने में विफल</string>
-    <string name="version_history">संस्करण इतिहास</string>
-    <string name="archive">पुरालेख</string>
-    <string name="archived">कार्ड संग्रहीत</string>
-    <string name="barcodeLongPressMessage">गैलरी ऐप में केवल छवियां ही खोली जा सकती हैं</string>
-    <string name="license">परवाना</string>
-    <string name="source_repository">स्रोत रिपोजिटरी</string>
-    <string name="include_if_asking_support">यदि आप सहायता का अनुरोध करना चाहते हैं, तो निम्नलिखित जानकारी शामिल करें:</string>
-    <string name="starred">तारांकित</string>
-    <string name="unarchived">कार्ड अनारक्षित</string>
-    <plurals name="groupCardCountWithArchived">
-        <item quantity="one"><xliff:g>%1$d</xliff:g> कार्ड (<xliff:g id="archivedCount">%2$d</xliff:g> संग्रहीत)</item>
-        <item quantity="other"><xliff:g>%1$d</xliff:g> कार्ड (<xliff:g id="archivedCount">%2$d</xliff:g> संग्रहीत)</item>
-    </plurals>
-    <plurals name="viewArchivedCardsWithCount">
-        <item quantity="one">संग्रह देखें (<xliff:g>%1$d</xliff:g> कार्ड)</item>
-        <item quantity="other">संग्रह देखें (<xliff:g>%1$d</xliff:g> कार्ड)</item>
-    </plurals>
-    <string name="updateBalanceTitle">आपने कितना खर्च किया?</string>
-    <string name="chooseValidFromDate">दिनांक से वैध चुनें</string>
-    <string name="show_name_below_image_thumbnail">छवि थंबनेल के नीचे नाम दिखाएँ</string>
-    <string name="show_archived_cards">संग्रहीत कार्ड दिखाएँ</string>
-    <string name="manually_enter_barcode_instructions">अपने कार्ड पर आईडी नंबर या टेक्स्ट दर्ज करें और अपने कार्ड पर मौजूद बारकोड की तरह दिखने वाले बारकोड को दबाएं।</string>
-    <string name="welcome">कैटिमा में आपका स्वागत है</string>
-    <string name="previousCard">पिछला</string>
-    <string name="failedLaunchingPhotoPicker">कोई समर्थित गैलरी ऐप नहीं मिल सका</string>
-    <string name="reverse">...उल्टे क्रम में</string>
-    <string name="height">ऊंचाई:</string>
-    <string name="importVoucherVaultMessage">आयात करने के लिए वाउचर वॉल्ट से अपना <i>vouchervault.json</i> निर्यात चुनें।
-\nसबसे पहले वाउचर वॉल्ट में एक्सपोर्ट दबाकर इसे बनाएं।</string>
-    <string name="turn_flashlight_on">टॉर्च चालू करें</string>
-    <string name="sort_by_name">नाम</string>
-    <string name="credits">श्रेय</string>
-    <string name="unarchive">असंग्रहित</string>
-    <string name="failedToOpenUrl">सबसे पहले एक वेब ब्राउज़र इंस्टॉल करें</string>
-    <string name="currentBalanceSentence">वर्तमान शेष: <xliff:g>%s</xliff:g></string>
-    <string name="newBalanceSentence">नया शेष: <xliff:g>%s</xliff:g></string>
-    <string name="validFromDate">से मान्य</string>
-    <string name="validFromSentence">यहां से मान्य: <xliff:g>%s</xliff:g></string>
-    <string name="switchToFrontImage">सामने वाली छवि पर स्विच करें</string>
-    <string name="switchToBackImage">पिछली छवि पर स्विच करें</string>
-    <string name="switchToBarcode">बारकोड पर स्विच करें</string>
-    <string name="openFrontImageInGalleryApp">गैलरी ऐप में सामने वाली छवि खोलें</string>
-    <string name="openBackImageInGalleryApp">गैलरी ऐप में पिछली छवि खोलें</string>
-    <string name="setBarcodeHeight">बारकोड ऊंचाई सेट करें</string>
-    <string name="icon_header_click_text">थंबनेल संपादित करने के लिए देर तक दबाएँ</string>
-    <string name="enter_card_id">अपने कार्ड पर आईडी नंबर या पाठ दर्ज करें</string>
 </resources>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -244,7 +244,6 @@
    <string name="settings_oled_dark">Potpuno crna pozadina za tamnu temu</string>
    <string name="settings_theme_color">Boja teme</string>
    <string name="settings_brown_theme">Smeđa</string>
-    <string name="app_contributors">Omogućuje: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="showMoreInfo">Prikaži informacije</string>
    <string name="sort_by_name">Ime</string>
    <string name="sort_by_most_recently_used">Nedavno korišteno</string>
@@ -290,5 +289,4 @@
    <string name="settings_category_title_privacy">Privatnost</string>
    <string name="settings_keep_screen_on_summary">Deaktivira isključivanje ekrana tijekom prikaza kartice</string>
    <string name="app_name">Catima</string>
-    <string name="settings_follow_sensor_orientation">Uvijek rotiraj (ignorira sistemske postavke)</string>
 </resources>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -158,7 +158,6 @@
    <string name="settings_blue_theme">Kék</string>
    <string name="settings_sky_blue_theme">Égszínkék</string>
    <string name="settings_brown_theme">Barna</string>
-    <string name="app_contributors">Lehetővé tették: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="showMoreInfo">Információk megjelenítése</string>
    <string name="reverse">…fordított sorrendben</string>
    <string name="sort_by">Rendezés:</string>
@@ -283,5 +282,4 @@
    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os és közreműködők</string>
    <string name="show_archived_cards">Archivált kártyák megjelenítése</string>
    <string name="app_name">Catima</string>
-    <string name="settings_follow_sensor_orientation">Mindig forgassa (figyelmen kívül hagyja a rendszerbeállításokat)</string>
 </resources>
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
    <string name="storeName">Nama</string>
    <string name="note">Keterangan</string>
    <string name="delete">Hapus</string>
@@ -139,7 +139,7 @@
    <string name="privacy_policy_popup_text">Pemberitahuan kebijakan privasi (diperlukan oleh beberapa toko aplikasi): 
 \n
 \nTIDAK ADA DATA YANG DIKUMPULKAN SAMA SEKALI, yang dapat dikonfirmasi oleh siapa pun karena aplikasi kami adalah libre software.</string>
-    <string name="importCatimaMessage">Pilih ekspor <i>catima.zip</i> Anda dari Catima untuk diimpor.
+    <string name="importCatimaMessage">Pilih ekspor <i>catima.zip</i> Anda dari Catima untuk diimpor. 
 \nBuat dari menu Impor/Ekspor aplikasi Catima lain dengan menekan Ekspor di sana terlebih dahulu.</string>
    <string name="importFidmeMessage">Pilih ekspor <i>fidme-export-request-xxxxxx.zip</i> Anda dari FidMe untuk diimpor, dan pilih jenis barcode secara manual setelahnya. 
 \nBuat dari profil FidMe Anda dengan memilih Perlindungan Data lalu tekan Ekstrak data saya terlebih dahulu.</string>
@@ -161,7 +161,6 @@
    <string name="passwordRequired">Silahkan masukan kata sandi</string>
    <string name="exportPassword">Tetapkan kata sandi untuk melindungi ekspor anda (opsional)</string>
    <string name="failedGeneratingShareURL">Tidak dapat membuat alamat berbagi. Mohon laporkan ini.</string>
-    <string name="app_contributors">Pengembangan dibantu oleh: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="reverse">…dalam urutan terbalik</string>
    <string name="version_history">Riwayat Versi</string>
    <string name="help_translate_this_app">Bantu terjemahkan aplikasi ini</string>
@@ -276,5 +275,4 @@
    <string name="addWithoutBarcode">Tambah kartu tanpa barcode</string>
    <string name="field_must_not_be_empty">Isian tidak boleh kosong</string>
    <string name="app_name">Catima</string>
-    <string name="settings_follow_sensor_orientation">Selalu rotasi (abaikan pengaturan sistem)</string>
 </resources>
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
    <string name="action_add">Bæta</string>
    <string name="noBarcode">Nei strikamerkið</string>
    <string name="action_search">Leita að</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -170,7 +170,6 @@
    <string name="settings_pink_theme">Rosa</string>
    <string name="settings_catima_theme">Catima</string>
    <string name="settings_theme_color">Colore del tema</string>
-    <string name="app_contributors">Reso possibile da: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="noGroupCards">Questo gruppo è vuoto</string>
    <string name="barcodeImageDescriptionWithType">Immagine del codice a barre in formato <xliff:g>%s</xliff:g></string>
    <string name="sort_by">Ordina per</string>
@@ -290,5 +289,4 @@
    <string name="addWithoutBarcode">Aggiungere una carta senza codice a barre</string>
    <string name="field_must_not_be_empty">Il campo non deve essere vuoto</string>
    <string name="app_name">Catima</string>
-    <string name="settings_follow_sensor_orientation">Ruota sempre (ignora le impostazioni di sistema)</string>
 </resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
    <string name="wrongValueForBarcodeType">選択したバーコード形式ではこの番号は使用できません</string>
    <string name="unsupportedBarcodeType">このバーコード形式は表示できません。将来のアップデートにより対応するかもしれません。</string>
    <string name="setBarcodeId">バーコード番号を設定</string>
@@ -67,6 +67,8 @@
    <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
    <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
    <string name="app_license">Copylefted libre software, licensed GPLv3+</string>
+    <string name="app_copyright_old">Based on Loyalty Card Keychain
+\ncopyright © 2016–2020 Branden Archer.</string>
    <string name="app_resources">Libre third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="about">Catimaについて</string>
    <string name="importOptionApplicationButton">外部のアプリを使う</string>
@@ -115,7 +117,7 @@
    <string name="note">メモ</string>
    <string name="storeName">名前</string>
    <string name="noMatchingGiftCards">該当なし</string>
-    <string name="noGiftCards">+ボタンからカードを新規追加、⋮メニューからカードをインポートすることができます。</string>
+    <string name="noGiftCards">まず初めに+ボタンを押してカードを追加するか、メニューから以前のカードをインポートしてください。</string>
    <string name="action_add">追加</string>
    <string name="action_search">検索</string>
    <string name="intent_import_card_from_url_share_multiple_text">カードを共有しましょう</string>
@@ -149,16 +151,15 @@
        <item quantity="other"><xliff:g>%d</xliff:g> 枚のカードの削除</item>
    </plurals>
    <string name="barcodeImageDescriptionWithType">バーコード形式の画像 <xliff:g>%s</xliff:g></string>
-    <string name="app_contributors">Made possible by: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="settings_brown_theme">ブラウン/茶色</string>
-    <string name="settings_grey_theme">グレー/灰色</string>
-    <string name="settings_green_theme">グリーン/緑色</string>
-    <string name="settings_sky_blue_theme">スカイブルー/水色</string>
-    <string name="settings_blue_theme">ブルー/青色</string>
-    <string name="settings_violet_theme">バイオレット/菫色</string>
-    <string name="settings_magenta_theme">マゼンタ/赤紫色</string>
-    <string name="settings_pink_theme">ピンク/桃色</string>
-    <string name="settings_catima_theme">Catimaテーマ</string>
+    <string name="settings_brown_theme">Brown</string>
+    <string name="settings_grey_theme">Gray</string>
+    <string name="settings_green_theme">Green</string>
+    <string name="settings_sky_blue_theme">Sky Blue</string>
+    <string name="settings_blue_theme">Blue</string>
+    <string name="settings_violet_theme">Violet</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Pink</string>
+    <string name="settings_catima_theme">Catima</string>
    <string name="settings_theme_color">テーマカラー</string>
    <string name="settings_system_locale">システムに従う</string>
    <string name="settings_locale">言語</string>
@@ -184,10 +185,10 @@
    <string name="group_updated">グループを更新しました</string>
    <string name="editGroup">グループ編集: <xliff:g>%s</xliff:g></string>
    <string name="selectColor">色を選択</string>
-    <string name="setIcon">サムネイルを設定</string>
+    <string name="setIcon">アイコン設定</string>
    <string name="group_edit">グループ編集</string>
    <string name="group_name_already_in_use">このグループ名は既に使用されています</string>
-    <string name="group_name_is_empty">空欄にすることはできません</string>
+    <string name="group_name_is_empty">グループ名を入力してください</string>
    <string name="shortcutSelectCard">カードを選択してください</string>
    <string name="translate_platform">on Weblate</string>
    <string name="options">オプション</string>
@@ -196,14 +197,4 @@
    <string name="chooseValidFromDate">有効期限を選択</string>
    <string name="anyDate">無期限</string>
    <string name="app_name">Catima</string>
-    <string name="settings_card_orientation">バーコードの向き</string>
-    <string name="settings_display_barcode_max_brightness_summary">仕事をするためにいくつかのスキャナーが必要</string>
-    <string name="settings_follow_system_orientation">システムに従う</string>
-    <string name="storageReadPermissionRequired">このアクションのためにストレージの読み取り権限を許可…</string>
-    <string name="cameraPermissionDeniedTitle">カメラへアクセスできません</string>
-    <string name="settings_follow_sensor_orientation">自動回転 (システムを無視)</string>
-    <string name="cameraPermissionRequired">このアクションのためにカメラへのアクセス権限の許可…</string>
-    <string name="settings_landscape_orientation">横</string>
-    <string name="settings_portrait_orientation">縦</string>
-    <string name="noGiftCardsGroup">いくつかのカードを作って、それらをこのグループにアサインします。</string>
 </resources>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -96,7 +96,6 @@
    <string name="settings_magenta_theme">자홍색</string>
    <string name="settings_violet_theme">보라색</string>
    <string name="settings_blue_theme">파란색</string>
-    <string name="app_contributors">기여자: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="showMoreInfo">정보 보기</string>
    <string name="updateBalance">잔액 업데이트</string>
    <string name="failedToRetrieveImageFile">이미지 파일을 검색하지 못했습니다</string>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -171,7 +171,6 @@
    <string name="settings_pink_theme">Rožinė</string>
    <string name="settings_catima_theme">Catima</string>
    <string name="settings_theme_color">Temos spalva</string>
-    <string name="app_contributors">Tapo įmanoma su pagalba: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="noGroupCards">Grupėje yra tuščia</string>
    <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> brūkšninio kodo vaizdas</string>
    <string name="sort_by">Rikiuoti pagal</string>
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -128,7 +128,6 @@
    <string name="settings_locale">Valoda</string>
    <string name="failedGeneratingShareURL">Nevarēja izveidot koplietojamu URL. Lūdzu, ziņojiet par šo kļūdu.</string>
    <string name="turn_flashlight_off">Izslēgt zibspuldzi</string>
-    <string name="app_contributors">To padarīja iespējamu: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="version_history">Versiju vēsture</string>
    <string name="sort_by">Kārtot pēc</string>
    <string name="help_translate_this_app">Palīdziet tulkot šo lietotni</string>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -157,7 +157,6 @@
    <string name="settings_locale">Språk</string>
    <string name="settings_violet_theme">Fiolett</string>
    <string name="settings_magenta_theme">Magentarød</string>
-    <string name="app_contributors">Muliggjort av: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="settings_brown_theme">Brun</string>
    <string name="settings_grey_theme">Grå</string>
    <string name="settings_green_theme">Grønn</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -167,7 +167,6 @@
    <string name="settings_pink_theme">Roze</string>
    <string name="settings_catima_theme">Catima</string>
    <string name="settings_theme_color">Themakleur</string>
-    <string name="app_contributors">Mede mogelijk gemaakt door: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="noGroupCards">Deze groep bevat geen kaarten</string>
    <string name="barcodeImageDescriptionWithType">Afbeelding van barcode <xliff:g>%s</xliff:g></string>
    <string name="sort_by">Sorteren op</string>
@@ -283,5 +282,4 @@
    <string name="addWithoutBarcode">Kaart zonder barcode toevoegen</string>
    <string name="field_must_not_be_empty">Dit veld is vereist</string>
    <string name="app_name">Catima</string>
-    <string name="settings_follow_sensor_orientation">Altijd draaien (negeert systeeminstellingen)</string>
 </resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -69,7 +69,6 @@
    <string name="barcodeType">Typ kodu kreskowego</string>
    <string name="deleteTitle">Usuń kartę</string>
    <string name="deleteConfirmation">Usunąć tę kartę na stałe\?</string>
-    <string name="app_contributors">Możliwe dzięki: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="settings_brown_theme">Brązowy</string>
    <string name="settings_grey_theme">Szary</string>
    <string name="settings_green_theme">Zielony</string>
@@ -297,5 +296,4 @@
    <string name="addWithoutBarcode">Dodaj kartę bez kodu kreskowego</string>
    <string name="field_must_not_be_empty">Pole nie może być puste</string>
    <string name="app_name">Catima</string>
-    <string name="settings_follow_sensor_orientation">Zawsze obracaj (ignoruje ustawienia systemowe)</string>
 </resources>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -163,7 +163,6 @@
    <string name="settings_magenta_theme">Magenta</string>
    <string name="settings_violet_theme">Violeta</string>
    <string name="settings_blue_theme">Azul</string>
-    <string name="app_contributors">Tornado possível por: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="sort">Ordenar</string>
    <string name="sort_by_name">Nome</string>
    <string name="sort_by_most_recently_used">Mais usados recentemente</string>
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -78,7 +78,7 @@
    <string name="points">Puncte</string>
    <string name="cardShortcut">Scurtătură de card</string>
    <string name="scanCardBarcode">Scanați codul de bare</string>
-    <string name="importExportHelp">Copierea de rezervă a datelor vă permite să le mutați pe un alt dispozitiv.</string>
+    <string name="importExportHelp">Copierea de rezervă a datelor vă permite să le mutați pe un alt dispozitiv</string>
    <string name="exportSuccessfulTitle">Exportată</string>
    <string name="exportFailedTitle">Export eșuat</string>
    <string name="importOptionFilesystemExplanation">Alegeți un anumit fișier din sistemul de fișiere.</string>
@@ -189,7 +189,6 @@
    <string name="settings_follow_system_orientation">Urmare sistem</string>
    <string name="reverse">...în ordine inversă</string>
    <string name="settings_brown_theme">Maro</string>
-    <string name="app_contributors">Făcut posibil de: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="app_copyright_short">Drepturi de autor © Sylvia van Os și contribuabilii</string>
    <string name="settings_oled_dark">Fundal pur negru pentru tema închisă</string>
    <string name="starred">Favorite</string>
@@ -290,5 +289,4 @@
    <string name="settings_keep_screen_on_summary">Dezactivează temporizatorul de ecran când vizualizați un card</string>
    <string name="rate_this_app">Acordați o recenzie acestei aplicații</string>
    <string name="credits">Contribuabili</string>
-    <string name="settings_follow_sensor_orientation">Rotește întotdeauna (ignora setările de sistem)</string>
 </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -175,7 +175,6 @@
    <string name="settings_magenta_theme">Пурпурный</string>
    <string name="settings_pink_theme">Розовый</string>
    <string name="settings_theme_color">Цвет темы</string>
-    <string name="app_contributors">Создано при поддержке: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="noGroupCards">Группа пуста</string>
    <string name="barcodeImageDescriptionWithType">Изображение штрих-кода <xliff:g>%s</xliff:g></string>
    <string name="sort_by_expiry">Срок действия</string>
@@ -297,5 +296,4 @@
    <string name="addWithoutBarcode">Добавить карту без штрих-кода</string>
    <string name="field_must_not_be_empty">Поле не может быть пустым</string>
    <string name="app_name">Catima</string>
-    <string name="settings_follow_sensor_orientation">Всегда поворачивать (игнорировать системные настройки)</string>
 </resources>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -249,7 +249,6 @@
 \nZískate ho zaslaním e-mailu na adresu support@stocardapp.com, v ktorom požiadate o export svojich údajov.</string>
    <string name="currentBalanceSentence">Aktuálny zostatok: <xliff:g>%s</xliff:g></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="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>
@@ -290,5 +289,4 @@
    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os a prispievateľov</string>
    <string name="show_archived_cards">Zobraziť archivované karty</string>
    <string name="app_name">Catima</string>
-    <string name="settings_follow_sensor_orientation">Vždy otáčať (ignoruje nastavenie systému)</string>
 </resources>
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -239,7 +239,6 @@
    <string name="settings_oled_dark">Čisto črno ozadje za temno temo</string>
    <string name="selectColor">Izberite barvo</string>
    <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>
    <plurals name="groupCardCountWithArchived">
        <item quantity="one"><xliff:g>%1$d</xliff:g> kartica (<xliff:g id="archivedCount">%2$d</xliff:g> arhivirana)</item>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -156,7 +156,6 @@
    <string name="note">Anteckning</string>
    <string name="settings_system_locale">System</string>
    <string name="settings_locale">Språk</string>
-    <string name="app_contributors">Möjliggjordes av: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="settings_brown_theme">Brunt</string>
    <string name="settings_grey_theme">Grått</string>
    <string name="settings_green_theme">Grönt</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/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="app_contributors">Katkıda bulunanlar: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="settings_brown_theme">Kahverengi</string>
    <string name="settings_grey_theme">Gri</string>
    <string name="settings_green_theme">Yeşil</string>
@@ -283,5 +282,4 @@
    <string name="addWithoutBarcode">Barkodsuz bir kart ekle</string>
    <string name="field_must_not_be_empty">Alan boş olamaz</string>
    <string name="app_name">Catima</string>
-    <string name="settings_follow_sensor_orientation">Her zaman döndür (sistem ayarlarını yok sayar)</string>
 </resources>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -87,7 +87,7 @@
    <string name="app_license">Вільне копілефт програмне забезпечення, ліцензоване GPLv3+</string>
    <string name="app_copyright_old">Створено на основі Loyalty Card Keychain
 \nавторські права © 2016–2020 Branden Archer</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Авторські права © 2019–<xliff:g>%d</xliff:g> Sylvia van Os та співавтори</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Авторські права © 2019–<xliff:g>%d</xliff:g> Sylvia van Os та вкладники</string>
    <string name="about">Про застосунок</string>
    <string name="importOptionApplicationButton">Використати інший застосунок</string>
    <string name="importOptionApplicationExplanation">Використайте інший застосунок чи ваш улюблений файловий менеджер для відкриття файлу.</string>
@@ -131,7 +131,7 @@
    <string name="action_search">Пошук</string>
    <string name="turn_flashlight_off">Вимкнути спалах</string>
    <string name="turn_flashlight_on">Увімкнути спалах</string>
-    <string name="failedGeneratingShareURL">Збій створення URL обміну. Будь ласка повідомте про це.</string>
+    <string name="failedGeneratingShareURL">Збій створення URL обміну. Будь ласка повідомте про цю помилку.</string>
    <string name="passwordRequired">Будь ласка введіть пароль</string>
    <string name="takePhoto">Зробити світлину</string>
    <string name="removeImage">Видалити зображення</string>
@@ -140,9 +140,9 @@
    <string name="photos">Світлини</string>
    <string name="backImageDescription">Тильна сторона</string>
    <string name="frontImageDescription">Лицьова сторона</string>
-    <string name="importStocardMessage">Виберіть експорт <i> ***.zip </i> з Stocard для імпорту. 
+    <string name="importStocardMessage">Виберіть експорт <i> ***.zip </i> зі Stocard для імпорту.
 \nОтримайте його, надіславши електронного листа support@stocardapp.com з проханням експортувати ваші дані.</string>
-    <string name="importStocard">Імпорт з Stocard</string>
+    <string name="importStocard">Імпорт із Stocard</string>
    <plurals name="selectedCardCount">
        <item quantity="one">Обрано: <xliff:g>%d</xliff:g></item>
        <item quantity="few">Обрані: <xliff:g>%d</xliff:g></item>
@@ -175,7 +175,6 @@
    <string name="settings_grey_theme">Сірий</string>
    <string name="settings_green_theme">Зелений</string>
    <string name="settings_sky_blue_theme">Небесно-синій</string>
-    <string name="app_contributors">Стало можливим завдяки: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="noGroupCards">Пуста група</string>
    <string name="barcodeImageDescriptionWithType">Зображення штрих-коду <xliff:g>%s</xliff:g></string>
    <string name="sort_by">Сортувати за</string>
@@ -280,13 +279,13 @@
    <string name="settings_keep_screen_on_summary">Вимикає тайм-аут екрана під час перегляду картки</string>
    <string name="settings_disable_lockscreen_while_viewing_card_summary">Вимикає блокування екрана під час перегляду картки</string>
    <string name="settings_allow_content_provider_read_title">Дозволити іншим застосункам доступ до моїх даних</string>
-    <string name="settings_oled_dark_summary">Зменшує використання батареї на OLED екранах</string>
+    <string name="settings_oled_dark_summary">Зменшує використання батареї на екранах з OLED</string>
    <string name="settings_category_title_cards">Картки</string>
    <string name="settings_category_title_general">Загальні</string>
    <string name="settings_category_title_privacy">Конфіденційність</string>
    <string name="view_online">Переглянути онлайн</string>
-    <string name="action_display_options">Параметри відображення</string>
-    <string name="app_copyright_short">Авторські права © Sylvia van Os та співавтори</string>
+    <string name="action_display_options">Налаштування дисплея</string>
+    <string name="app_copyright_short">Авторські права © Sylvia van Os та вкладники</string>
    <string name="show_archived_cards">Показати архівовані картки</string>
    <string name="card_id_must_not_be_empty">ID картки не повинен бути порожнім</string>
    <string name="balanceParsingFailed">Неправильний баланс</string>
@@ -297,5 +296,4 @@
    <string name="addWithoutBarcode">Додати картку без штрих-коду</string>
    <string name="field_must_not_be_empty">Поле вводу не повинно бути порожнім</string>
    <string name="app_name">Catima</string>
-    <string name="settings_follow_sensor_orientation">Завжди обертати (ігнорувати системні налаштування)</string>
 </resources>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -48,7 +48,7 @@
    <string name="expiryStateSentence">Hết hạn: <xliff:g>%s</xliff:g></string>
    <string name="all">Tất cả</string>
    <string name="setIcon">Đặt ảnh con</string>
-    <string name="cardShortcut">Lối tắt thẻ</string>
+    <string name="cardShortcut">Lối Tắt Cho Thẻ</string>
    <string name="moveUp">Đẩy lên</string>
    <string name="noBarcodeFound">Không tìm thấy mã vạch nào</string>
    <string name="settings_category_title_general">Tổng quan</string>
@@ -86,7 +86,7 @@
    <string name="yes">Có</string>
    <string name="barcodeType">Loại mã vạch</string>
    <string name="enter_card_id">Nhập số ID hoặc văn bản lên thẻ của bạn</string>
-    <string name="unarchived">Thẻ đã được mở khóa</string>
+    <string name="unarchived">Thẻ không lưu trữ</string>
    <string name="noBarcode">Không có mã vạch</string>
    <string name="chooseValidFromDate">Chọn ngày hợp lệ</string>
    <string name="action_display_options">Tùy chỉnh hiển thị</string>
@@ -151,7 +151,7 @@
    <string name="options">Tùy chọn</string>
    <string name="sendLabel">Gửi…</string>
    <string name="importOptionFilesystemButton">Lấy từ hệ thống</string>
-    <string name="settings_magenta_theme">Màu sắc tố tím và đỏ</string>
+    <string name="settings_magenta_theme">Màu tím đỏ</string>
    <string name="importOptionApplicationButton">Dùng ứng dụng khác</string>
    <string name="failedGeneratingShareURL">Không tạo được URL chia sẻ. Xin hãy báo cáo sự cố này.</string>
    <string name="selectColor">Chọn màu</string>
@@ -245,7 +245,7 @@
        <item quantity="other"><xliff:g>%d</xliff:g> thẻ</item>
    </plurals>
    <plurals name="selectedCardCount">
-        <item quantity="other"><xliff:g>%d</xliff:g> đã được chọn</item>
+        <item quantity="other">Chọn <xliff:g>%d</xliff:g></item>
    </plurals>
    <string name="version_history">Lịch Sử Phiên Bản</string>
    <string name="note">Ghi chú</string>
@@ -274,7 +274,4 @@
    <string name="switchToFrontImage">Chuyển sang hình ảnh phía trước</string>
    <string name="openBackImageInGalleryApp">Mở lại hình ảnh trong ứng dụng thư viện</string>
    <string name="failedToRetrieveImageFile">Không thể truy xuất tệp hình ảnh</string>
-    <string name="app_contributors">Được thực hiện bởi: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="app_license">Phần mềm libre được bảo vệ bản quyền theo giấy phép GPLv3+.</string>
-    <string name="settings_follow_sensor_orientation">Luôn xoay (bỏ qua thiết đặt hệ thống)</string>
 </resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -198,7 +198,6 @@
    <string name="exportPassword">设置密码来保护导出的内容（可选）</string>
    <string name="settings_magenta_theme">紫红</string>
    <string name="settings_violet_theme">紫色</string>
-    <string name="app_contributors">因他们而存在: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="and_data_usage">和数据使用方法</string>
    <string name="failedLaunchingPhotoPicker">找不到支持的图库应用</string>
    <string name="previousCard">前一张</string>
@@ -276,5 +275,4 @@
    <string name="addWithoutBarcode">不使用条形码添加卡片</string>
    <string name="field_must_not_be_empty">字段不能为空</string>
    <string name="app_name">Catima</string>
-    <string name="settings_follow_sensor_orientation">始终旋转（忽略系统设置）</string>
 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,5 +1,5 @@
 <?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="action_search">搜尋</string>
    <string name="action_add">新增</string>
    <string name="noGiftCards">點選 + 按鈕以新增卡片，或從 ⋮ 選單中匯入。</string>
@@ -116,7 +116,6 @@
    <string name="settings_locale">語言</string>
    <string name="settings_system_locale">系統語言</string>
    <string name="settings_theme_color">主題顏色</string>
-    <string name="app_contributors">感謝以下貢獻者：<xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="privacy_policy">隱私權政策</string>
    <plurals name="selectedCardCount">
        <item quantity="other">已選取 <xliff:g>%d</xliff:g></item>
@@ -275,5 +274,4 @@
    <string name="enter_card_id">輸入卡片上的 ID 或文字</string>
    <string name="settings_display_barcode_max_brightness_summary">一些條碼掃描器需要此設定方能運作</string>
    <string name="field_must_not_be_empty">欄位不能為空</string>
-    <string name="settings_follow_sensor_orientation">始終旋轉（忽略系統設定）</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -248,7 +248,6 @@
    <string name="settings_key_green_theme" translatable="false">green_theme</string>
    <string name="settings_key_grey_theme" translatable="false">grey_theme</string>
    <string name="settings_key_brown_theme" translatable="false">brown_theme</string>
-    <string name="app_contributors">Made possible by: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="sort">Sort</string>
    <string name="showMoreInfo">Show info</string>
    <string name="updateBalance">Update balance</string>
@@ -335,7 +334,5 @@
    <string name="add_a_card_in_a_different_way">Add a card in a different way</string>
    <string name="field_must_not_be_empty">Field must not be empty</string>
    <string name="manually_enter_barcode_instructions">Enter the ID number or text on your card and press the barcode that looks like the one on your card.</string>
-    <string name="add_manually_warning_title">Scanning is recommended</string>
-    <string name="add_manually_warning_message">For some stores, the barcode value differs from the number written on the card. Because of this, entering a barcode manually may not always work. It is strongly recommended to scan the barcode with your camera instead. Do you still want to continue?</string>
-    <string name="continue_">Continue</string>
+    <string name="view_more_contributors">View more contributors</string>
 </resources>
--- a/app/src/test/java/protect/card_locker/BarcodeSelectorActivityTest.java
+++ b/app/src/test/java/protect/card_locker/BarcodeSelectorActivityTest.java
@@ -1,8 +1,9 @@
 package protect.card_locker;

-import static org.junit.Assert.assertEquals;
-
 import android.app.Activity;
+import android.content.Intent;
+import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;

 import org.junit.Test;
@@ -10,6 +11,12 @@ import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.android.controller.ActivityController;
+import org.robolectric.shadows.ShadowLooper;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.robolectric.Shadows.shadowOf;


@RunWith(RobolectricTestRunner.class)
--- a/app/src/test/java/protect/card_locker/DatabaseTest.java
+++ b/app/src/test/java/protect/card_locker/DatabaseTest.java
@@ -1,11 +1,5 @@
 package protect.card_locker;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import android.app.Activity;
 import android.content.ContentValues;
 import android.database.Cursor;
@@ -19,12 +13,19 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;

 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Currency;
 import java.util.List;

+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
@RunWith(RobolectricTestRunner.class)
 public class DatabaseTest {
    private SQLiteDatabase mDatabase;
--- a/app/src/test/java/protect/card_locker/ImportExportActivityTest.java
+++ b/app/src/test/java/protect/card_locker/ImportExportActivityTest.java
@@ -1,8 +1,5 @@
 package protect.card_locker;

-import static org.junit.Assert.assertEquals;
-import static org.robolectric.Shadows.shadowOf;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -17,6 +14,9 @@ import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;

+import static org.junit.Assert.assertEquals;
+import static org.robolectric.Shadows.shadowOf;
+
@RunWith(RobolectricTestRunner.class)
 public class ImportExportActivityTest {
    private void registerIntentHandler(String handler) {
--- a/app/src/test/java/protect/card_locker/ImportExportTest.java
+++ b/app/src/test/java/protect/card_locker/ImportExportTest.java
@@ -1,11 +1,5 @@
 package protect.card_locker;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.robolectric.Shadows.shadowOf;
-
 import android.app.Activity;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
@@ -51,6 +45,12 @@ import protect.card_locker.importexport.ImportExportResultType;
 import protect.card_locker.importexport.MultiFormatExporter;
 import protect.card_locker.importexport.MultiFormatImporter;

+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.robolectric.Shadows.shadowOf;
+
@RunWith(RobolectricTestRunner.class)
 public class ImportExportTest {
    private Activity activity;
--- a/app/src/test/java/protect/card_locker/ImportURITest.java
+++ b/app/src/test/java/protect/card_locker/ImportURITest.java
@@ -1,9 +1,5 @@
 package protect.card_locker;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import android.app.Activity;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Color;
@@ -23,6 +19,10 @@ import java.math.BigDecimal;
 import java.util.Currency;
 import java.util.Date;

+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
@RunWith(RobolectricTestRunner.class)
 public class ImportURITest {
    private ImportURIHelper importURIHelper;
--- a/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java
@@ -1,9 +1,5 @@
 package protect.card_locker;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-
 import android.app.Activity;
 import android.content.SharedPreferences;
 import android.database.Cursor;
@@ -12,9 +8,6 @@ import android.graphics.Color;
 import android.view.View;
 import android.widget.TextView;

-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.preference.PreferenceManager;
-
 import com.google.zxing.BarcodeFormat;

 import org.junit.Before;
@@ -27,6 +20,13 @@ import org.robolectric.shadows.ShadowLog;
 import java.math.BigDecimal;
 import java.util.Currency;

+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.preference.PreferenceManager;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+
@RunWith(RobolectricTestRunner.class)
 public class LoyaltyCardCursorAdapterTest {
    private Activity activity;
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -1,19 +1,11 @@
 package protect.card_locker;

-import static android.os.Looper.getMainLooper;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.robolectric.Shadows.shadowOf;
-
 import android.app.Activity;
 import android.app.DatePickerDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -35,12 +27,9 @@ import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.SeekBar;
 import android.widget.TextView;

-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.constraintlayout.widget.ConstraintLayout;
-
 import com.google.android.material.bottomappbar.BottomAppBar;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
@@ -70,6 +59,21 @@ import java.time.temporal.ChronoUnit;
 import java.util.Currency;
 import java.util.Date;

+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.widget.TextViewCompat;
+import androidx.preference.PreferenceManager;
+
+import static android.os.Looper.getMainLooper;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.robolectric.Shadows.shadowOf;
+
@RunWith(RobolectricTestRunner.class)
 public class LoyaltyCardViewActivityTest {
    private final String BARCODE_DATA = "428311627547";
--- a/app/src/test/java/protect/card_locker/MainActivityTest.java
+++ b/app/src/test/java/protect/card_locker/MainActivityTest.java
@@ -1,10 +1,5 @@
 package protect.card_locker;

-import static android.os.Looper.getMainLooper;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.robolectric.Shadows.shadowOf;
-
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.SharedPreferences;
@@ -15,8 +10,6 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;

-import androidx.recyclerview.widget.RecyclerView;
-
 import com.google.android.material.tabs.TabLayout;
 import com.google.zxing.BarcodeFormat;

@@ -25,12 +18,20 @@ import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.android.controller.ActivityController;
+import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowActivity;

 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;

+import androidx.recyclerview.widget.RecyclerView;
+
+import static android.os.Looper.getMainLooper;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.robolectric.Shadows.shadowOf;
+
@RunWith(RobolectricTestRunner.class)
 public class MainActivityTest {
    private SharedPreferences prefs;
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.

 plugins {
-    id("com.android.application") version "8.2.2" apply false
+    id("com.android.application") version "8.2.1" apply false
    id("com.github.spotbugs") version "5.1.4" apply false
 }

--- a/docs/RELEASE_STEPS.md
+++ b/docs/RELEASE_STEPS.md
@@ -4,9 +4,8 @@
 1. Press "Commit" and "Push" on Weblate to ensure all translations are up to date
 2. Merge Weblate pull request
 3. Update `CHANGELOG.md` with the new version name and the release date
-4. Update `app/build.gradle.kts` with the new `versionCode` and `versionName`
+4. Update `app/build.gradle` with the new `versionCode` and `versionName`
 5. Build a new .apk: `KEYSTORE=/path/to/keystore KEYSTORE_ALIAS=catima ./build.sh`
 6. Upload the APK to Google Play Open Testing
-7. Push the version update: `git add CHANGELOG.md app/build.gradle.kts && git commit -m "Release Catima <VERSION>" && git push`
+7. Push the version update: `git add CHANGELOG.md app/build.gradle && git commit -m "Release Catima <VERSION>" && git push`
 8. Create a new release on GitHub and attach the `app-release.apk` and `SHA256SUMS` files
-9. After the release has been approved on Google Play Production, update the metadata there: `bundle exec fastlane supply --version_code <VERSION_CODE>`
--- a/fastlane/metadata/android/cs-CZ/changelogs/132.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/132.txt
@@ -3,4 +3,3 @@
 - Oprava okrajového případu způsobujícího neplatný stav uživatelského rozhraní při přepínání zobrazování archivu
 - Použití motivu nebo barvy karty pro navigační lištu (Android 8.1+)
 - Aktualizovaný výběr data platnosti a vypršení platnosti
- Přidání možnosti vždy otáčet (ignoruje nastavení systému)
--- a/fastlane/metadata/android/cs-CZ/changelogs/133.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/133.txt
@@ -1 +0,0 @@
- Cílový systém Android 14
--- a/fastlane/metadata/android/cs-CZ/full_description.txt
+++ b/fastlane/metadata/android/cs-CZ/full_description.txt
@@ -13,7 +13,7 @@ S tímto nezbytným nástrojem pro každodenní nošení (EDC) můžete nahradi
 - Sdílejte kupony, exkluzivní nabídky, propagační kódy nebo karty a kódy pomocí libovolné aplikace.
 - Tmavý motiv a možnosti zpřístupnění pro uživatele se zrakovým postižením.
 - Vytvořeno pro všechny komunitou svobodného softwaru.
- Lokalizované ručně prováděné překlady pro více než 40 jazyků.
+- Lokalizované ručně prováděné překlady pro více než 20 jazyků.
 - Zdarma, podporováno příspěvky komunity.
 - Používejte, studujte, měňte a sdílejte dle libosti – <i>se všemi</i>.
 - Nejen svobodný software / open source. <i>Copylefted</i> svobodný software (GPLv3+) na správu karet.
--- a/fastlane/metadata/android/de-DE/changelogs/11.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/11.txt
@@ -1,5 +1,5 @@
- Wenn du eine Karten-ID bearbeitest, wird die vorhandene ID zu Beginn ausgefüllt. (Pull #94 (https://github.com/brarcher/loyalty-card-locker/pull/94))
+- Wenn du eine Karten-ID bearbeitest wird die vorhandene ID zu Beginn ausgefüllt. (Pull #94 (https://github.com/brarcher/loyalty-card-locker/pull/94))
 - Begrenzen der Breite der erzeugten Barcodes, um die Speichernutzung und Fehler durch Speicherüberschreitung zu reduzieren. (Pull #103 (https://github.com/brarcher/loyalty-card-locker/pull/103))
- Beim Bearbeiten einer Karte wird die Schaltfläche "Karte eingeben" in "Karte bearbeiten" geändert, wenn bereits eine Karten-ID existiert. (Pull #104 (https://github.com/brarcher/loyalty-card-locker/pull/104))
+- Beim Bearbeiten einer Karte wird die Schaltfläche "Karte eingeben" in "Karte bearbeiten" geändert, wenn die Karten-ID existiert. (Pull #104 (https://github.com/brarcher/loyalty-card-locker/pull/104))
 - Farbschema angepasst so, dass mit dem App-Symbol kompatibel ist und das Layout beim Anzeigen einer Karte übersichtlicher gestaltet. (Pull #107 (https://github.com/brarcher/loyalty-card-locker/pull/107))
 - Hinzufügen eines Intro-Assistenten, der beim ersten Start der App gestartet wird. (Pull #108 (https://github.com/brarcher/loyalty-card-locker/pull/108))
--- a/fastlane/metadata/android/de-DE/changelogs/121.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/121.txt
@@ -1 +1 @@
- Verwendete Bibliotheken aktualisiert
+- Verwendete Bibliotheken upgedatet
--- a/fastlane/metadata/android/de-DE/changelogs/132.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/132.txt
@@ -1,6 +1,4 @@
 - "Karte hinzufügen" Worklow verbessert
 - Verbesserungen im Validierungsablauf
- Fehler behoben, der die Benutzeroberfläche beim Umschalten der Archivansicht in einen ungültigen Zustand versetzte
- System- oder Kartenfarbe wird für die Navigationsleiste benutzt (Android 8.1+)
- Aktualisierung des Datumsselektors für Gültigkeits- und Ablaufdatum
- Option hinzugefügt, um die Drehung der Anzeige zu erzwingen (ignoriert die Systemeinstellung)
+- Seltener UI Problemfall behoben, wenn man die Archivansicht umgeschaltet hat
+- Theme oder Kartenfarbe wird für die Navigationsleiste verwendet (Android 8.1+)
--- a/fastlane/metadata/android/de-DE/changelogs/133.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/133.txt
@@ -1 +0,0 @@
- auf Android 14 richten
--- a/fastlane/metadata/android/de-DE/full_description.txt
+++ b/fastlane/metadata/android/de-DE/full_description.txt
@@ -13,9 +13,9 @@ Mit diesem unverzichtbaren Programm schaffst du Platz für Bargeld statt für nu
 - Teile Gutscheine, exklusive Angebote, Werbeaktionscodes oder Karten und sonstige Codes mit allen Apps.
 - Dunkles Design und Barrierefreiheit für sehbehinderte Nutzer.
 - Von der Freien-Software-Gemeinschaft für alle Menschen gemacht.
- Lokalisierte, menschliche Übersetzungen für mehr als 40 Sprachen.
+- Lokalisierte, menschliche Übersetzungen für mehr als 20 Sprachen.
 - Kostenlos, unterstützt durch Gemeinschaftsbeiträge.
- Verwende, prüfe, ändere und teile die App, wie du willst; <i>mit allen</i>.
+- Verwende, prüfe, ändere und teile die App, wie du willst; <i>mit Allen</i>.
 - Nicht nur freie und quelloffene Software. Eine freie, <i>Copylefted</i> Software-Kartenverwaltung (GPLv3+).

 Vereinfache dein Leben und deine Einkäufe, und verliere nie wieder einen Beleg, eine Gutscheinkarte oder ein Flugticket.
--- a/fastlane/metadata/android/en-US/changelogs/133.txt
+++ b/fastlane/metadata/android/en-US/changelogs/133.txt
@@ -1,3 +0,0 @@
- Target Android 14
- Open card icon in gallery on touch
- Improve design of Photos tab in edit view
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -13,7 +13,7 @@ With this essential everyday carry (EDC) tool you can replace useless plastic wi
 - Share coupons, exclusive offers, promo codes, or cards and codes using any app.
 - Dark theme and accessibility options for vision impaired users.
 - Made for everyone by the libre software community.
- Localized hand-made translations for 40+ languages.
+- Localized hand-made translations for 20+ languages.
 - Gratis, supported by community contributions.
 - Use, study, change and share it as you wish; <i>with all</i>.
 - Not only Free Software / Open Source. <i>Copylefted</i> libre software (GPLv3+) card management.
--- a/fastlane/metadata/android/es-ES/changelogs/11.txt
+++ b/fastlane/metadata/android/es-ES/changelogs/11.txt
@@ -1,5 +1,5 @@
- Al editar un ID de tarjeta, pre-poblar el ID existente para comenzar. (pull #94 (https://github.com/brarcher/loyalty-card-locker/pull/94))
- Limitar el ancho de los códigos de barras generados para reducir el uso de memoria y los errores de memoria. (pull #103 (https://github.com/brarcher/loyalty-card-locker/pull/103))
- Cuando edite una tarjeta, cambie el botón "Enter Card" para decir "Editar Tarjeta" si ya existe una tarjeta ID. (pull #104 (https://github.com/brarcher/loyalty-card-locker/pull/104))
- Cambiar el esquema de color para que sea más suave y compatible con el icono de la aplicación, y cambiar el diseño al ver una tarjeta para que sea más limpio. (pull #107 (https://github.com/brarcher/loyalty-card-locker/pull/107))
- Añadir un asistente de introducción que se inicia en el primer lanzamiento de la aplicación. (pull #108 (https://github.com/brarcher/loyalty-card-locker/pull/108))
+- Cuando se edita un ID de tarjeta, se pre-rellena ahora el ID existente al empezar. (pull #94 (https://github.com/brarcher/loyalty-card-locker/pull/94))
+- Restricción del ancho de los códigos de barras generados para reducir el uso de memoria y los errores de memoria agotada. (pull #103 (https://github.com/brarcher/loyalty-card-locker/pull/103))
+-En la edición de tarjeta, cambio  del botón "Introducir Tarjeta" por "Editar Tarjeta" si ya existe un ID de tarjeta. (pull #104 (https://github.com/brarcher/loyalty-card-locker/pull/104))
+-Cambio de la combinación de colores para ser más tenue y compatible con el icono de la aplicación, y modificación de la distribución al ver una tarjeta por una más limpia. (pull #107 (https://github.com/brarcher/loyalty-card-locker/pull/107))
+-Adición de un asistente de inicio que se ejecute en el primer uso de la aplicación. (pull #108 (https://github.com/brarcher/loyalty-card-locker/pull/108))
--- a/fastlane/metadata/android/es-ES/full_description.txt
+++ b/fastlane/metadata/android/es-ES/full_description.txt
@@ -1,22 +1,22 @@
-Deje de buscar tarjetas de recompensa de plástico al pasar por caja en tiendas o tiendas web.
-<b>Escanea códigos de barras en tu dispositivo usando su cámara, olvídate de las tarjetas.</b>
+Detenga la búsqueda de tarjetas de recompensa de plástico durante el pago en la tienda o en la tienda web.
+<b>Escanea códigos de barras a tu dispositivo usando su cámara, olvídate de las tarjetas.</b>

-Olvídese de la cartera, o manténgala ultraligera para los objetos de valor.
+Olvídese de su billetera o manténgala ultraligera para objetos de valor.

-Con esta herramienta esencial para llevar a diario (EDC) puede sustituir el plástico inútil por dinero en efectivo.
+Con esta herramienta esencial de transporte diario (EDC), puede reemplazar el plástico inútil con dinero en efectivo.

- Evite espiar con muy pocos permisos. Sin acceso a Internet y sin anuncios.
- Añadir tarjetas o códigos con nombres y colores personalizables.
- Entrada manual de código si no hay código de barras para almacenar, o no se puede utilizar.
- Importar tarjetas y códigos de archivos, Catima, FidMe, Loyalty Card Keychain, Stocard y Voucher Vault.
- Haga una copia de seguridad de todas sus tarjetas y transferirlas a un nuevo dispositivo si lo desea.
- Comparte cupones, ofertas exclusivas, códigos promocionales o tarjetas y códigos utilizando cualquier aplicación.
+- Evita espiar con muy pocos permisos. Sin acceso a Internet y sin anuncios.
+- Añade tarjetas o códigos con nombres y colores personalizables.
+- Entrada de código manual si no hay un código de barras para almacenar o no se puede usar.
+- Importación de tarjetas y códigos desde ficheros, Catima, FidMe, Llavero Tarjeta Fidelización, Stocard y Bóveda de Vales.
+- Haga una copia de seguridad de todas sus tarjetas y transfiéralas a un nuevo dispositivo si lo desea.
+- Comparta cupones, ofertas exclusivas, códigos promocionales o tarjetas y códigos usando cualquier aplicación.
 - Tema oscuro y opciones de accesibilidad para usuarios con problemas de visión.
- Hecho para todos por la comunidad del software libre.
- Traducciones localizadas a mano para más de 40 idiomas.
- Gratis, gracias a las contribuciones de la comunidad.
- Utilízala, estúdiala, modifícala y compártela como quieras; <i>con todos</i>.
- No sólo Software Libre / Open Source. <i>Copylefted</i> software libre (GPLv3+) gestión de tarjetas.
+- Hecho para todos por la comunidad de software libre.
+- Traducciones hechas a mano localizadas para más de 20 idiomas.
+- Gratis, apoyado por contribuciones de la comunidad.
+- Úsalo, estúdialo, cámbialo y compártelo como quieras; <i>con todo</i>.
+- No solo Software Libre / Código Abierto. Gestión de tarjetas de software libre (GPLv3+) con <i>copyleft</i>.

-Simplifique su vida y sus compras, y no vuelva a perder un recibo en papel, una tarjeta regalo de pago en tienda o un billete de avión.
-Llévate todos tus premios y bonificaciones contigo y ahorra sobre la marcha.
+Simplifique su vida y sus compras, y nunca más pierda un recibo en papel, una tarjeta de regalo de pago en la tienda o un boleto de avión.
+Llévate todas tus recompensas y bonificaciones contigo y ahorra sobre la marcha.
--- a/fastlane/metadata/android/hi-IN/changelogs/11.txt
+++ b/fastlane/metadata/android/hi-IN/changelogs/11.txt
@@ -1,5 +0,0 @@
- कार्ड आईडी संपादित करते समय, शुरू करने के लिए मौजूदा आईडी को पहले से भरें। (खींचें #94 (https://github.com/brarcher/loyalty-card-locker/pull/94))
- मेमोरी उपयोग को कम करने और मेमोरी त्रुटियों को दूर करने के लिए जेनरेट किए गए बारकोड की चौड़ाई सीमित करें। (#103 खींचें (https://github.com/brarcher/loyalty-card-locker/pull/103))
- कार्ड संपादित करते समय, यदि कार्ड आईडी पहले से मौजूद है तो "कार्ड दर्ज करें" बटन को बदलकर "कार्ड संपादित करें" कहें। (#104 खींचें (https://github.com/brarcher/loyalty-card-locker/pull/104))
- रंग योजना को नरम और ऐप आइकन के साथ संगत करने के लिए बदलें, और कार्ड को साफ-सुथरा देखने के लिए लेआउट बदलें। (#107 खींचें (https://github.com/brarcher/loyalty-card-locker/pull/107))
- एक परिचय विज़ार्ड जोड़ें जो ऐप के पहले लॉन्च पर लॉन्च होता है। (#108 खींचें (https://github.com/brarcher/loyalty-card-locker/pull/108))
--- a/fastlane/metadata/android/hi-IN/changelogs/115.txt
+++ b/fastlane/metadata/android/hi-IN/changelogs/115.txt
@@ -1,4 +1,4 @@
- लंबे समय तक दबाकर रखने पर गैलरी में छवि खोलें
- संवाद में सामग्री शैली लागू करें
- कैटिमा में एक छवि साझा करके ग्रीटिंग कार्ड का समर्थन करें
- कार्ड स्क्रीन में त्वरित खर्च बटन जोड़ें
+-लम्बे दबाव पर गैलरी में इमेज को खोलें
+-संवादों में मटेरियल स्टाइल लागू करें
+-Catima पर इमेज साझा करके कार्ड बनाने का समर्थन 
+-कार्ड स्क्रीन पर त्वरित खर्च बटन जोड़ें
--- a/fastlane/metadata/android/hi-IN/changelogs/116.txt
+++ b/fastlane/metadata/android/hi-IN/changelogs/116.txt
@@ -1,2 +0,0 @@
- अनुमति न देने वाले त्वरित व्यय संवाद को ठीक करें, विभाजक
- फ़ाइल प्रबंधक से छवि लोड करने का समर्थन करें
--- a/fastlane/metadata/android/hi-IN/changelogs/124.txt
+++ b/fastlane/metadata/android/hi-IN/changelogs/124.txt
@@ -1 +0,0 @@
- कार्ड अवलोकन में वास्तव में कौन सा विवरण देखना है, इसका चयन करने में सहायता
--- a/fastlane/metadata/android/hi-IN/changelogs/127.txt
+++ b/fastlane/metadata/android/hi-IN/changelogs/127.txt
@@ -1,4 +0,0 @@
- बारकोड प्रतिपादन में सुधार
- बाहरी ऐप्स के साथ बुनियादी अंतरसंचालनीयता (एंड्रॉइड 6.0+)
- पुनर्गठित सेटिंग्स स्क्रीन
- कुछ ब्राउज़रों से आयात को ठीक करें जो शेयर यूआरएल में पिछला / जोड़ते हैं
--- a/fastlane/metadata/android/hi-IN/changelogs/129.txt
+++ b/fastlane/metadata/android/hi-IN/changelogs/129.txt
@@ -1,3 +0,0 @@
- बेहतर कैटिमा आयातक (आयात करते समय गुम हुए कार्डों को ठीक करता है)
- वैध दिनांक/समाप्ति तिथि निर्धारित करते समय स्क्रीन को घुमाते समय क्रैश को ठीक करें
- यूआई में मामूली बदलाव
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sylvia van Os	83becf707a	Replace contributors with link	2024-01-11 22:15:18 +01:00
Sylvia van Os	287f72f7d7	Support HTML in credits screen	2024-01-11 15:26:07 +01:00
				`@@ -1 +0,0 @@`
				`- कार्ड अवलोकन में वास्तव में कौन सा विवरण देखना है, इसका चयन करने में सहायता`