Add page number to barcode selector for PDF scan results

Update Gradle to 8.7

.github/workflows/android.yml

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

.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@v5.0.2
+      uses: peter-evans/create-pull-request@v6.0.2
       with:
         title: "Update Fastlane changelogs"
         commit-message: "Update Fastlane changelogs"

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

@@ -33,7 +33,7 @@ jobs:
         file_in_repo: app/src/main/res/raw/contributors.txt
         min_commit_count: 5
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5.0.2
+      uses: peter-evans/create-pull-request@v6.0.2
       with:
         title: "Update contributors"
         commit-message: "Update contributors"

.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@v5.0.2
+      uses: peter-evans/create-pull-request@v6.0.2
       with:
         title: "Update feature graphic"
         commit-message: "Update feature graphic"

.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@v1
+    - uses: gradle/wrapper-validation-action@v2
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5.0.2
+      uses: peter-evans/create-pull-request@v6.0.2
       with:
         title: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"
         commit-message: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"

.github/workflows/update-locales.yml

@@ -31,7 +31,7 @@ jobs:
     - name: Update locales
       run: .scripts/locales.py
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5.0.2
+      uses: peter-evans/create-pull-request@v6.0.2
       with:
         title: "Update locales"
         commit-message: "Update locales"

.scripts/generate_feature_graphic/generate_feature_graphic.sh

@@ -10,14 +10,21 @@ for lang in "$script_location/../../fastlane/metadata/android/"*; do
   if grep -q — title.txt; then
     # Try splitting title.txt on — (em dash)
     IFS='—' read -r appname subtext < title.txt
-  else
+  elif grep -q – title.txt; then
+    # No result, try splitting title.txt on – (en dash)
+    IFS='–' read -r appname subtext < title.txt
+  elif grep -q - title.txt; then
     # No result, try splitting on - (dash)
     IFS='-' read -r appname subtext < title.txt
+  else
+    # No result, use the full title as app name and default subtext
+    appname=$(< title.txt)
+    subtext="Loyalty Card Wallet"
   fi
   export appname=${appname%% }
   export subtext=${subtext## }
-  # If there is subtext, change the .svg accordingly
-  if [ -n "$subtext" ]; then
+  # If the appname isn't Catima or there is subtext, change the .svg accordingly
+  if [ "$appname" != "Catima" ] || [ -n "$subtext" ]; then
     perl -pi -e 's/Catima/$ENV{appname}/' featureGraphic.svg
     perl -pi -e 's/Loyalty Card Wallet/$ENV{subtext}/' featureGraphic.svg
     # Set correct font or font size for language if needed
@@ -25,6 +32,7 @@ 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 ;;

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## Unreleased - 134
+
+- Support for scanning PDF files for barcodes
+- Support for image files with multiple barcodes
+
+## v2.28.0 - 133 (2024-03-08)
+
+- Target Android 14
+- Open card icon in gallery on touch
+- Improve design of Photos tab in edit view
+- Update spending screen to also support receiving
+
 ## v2.27.0 - 132 (2024-01-30)
 
 - Refine "Add card" workflow

Gemfile.lock

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

app/build.gradle.kts

@@ -15,14 +15,14 @@ spotbugs {
 
 android {
     namespace = "protect.card_locker"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "me.hackerchick.catima"
         minSdk = 21
-        targetSdk = 33
-        versionCode = 132
-        versionName = "2.27.0"
+        targetSdk = 34
+        versionCode = 133
+        versionName = "2.28.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.9.0")
+    implementation("com.google.android.material:material:1.11.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.2")
+    implementation("com.google.zxing:core:3.5.3")
     implementation("org.apache.commons:commons-csv:1.9.0")
     implementation("com.jaredrummler:colorpicker:1.1.0")
     implementation("net.lingala.zip4j:zip4j:2.11.5")

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

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

app/src/main/AndroidManifest.xml

@@ -44,6 +44,7 @@
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="image/*" />
+                <data android:mimeType="application/pdf" />
             </intent-filter>
         </activity>
         <activity
@@ -111,10 +112,12 @@
             android:name=".preferences.SettingsActivity"
             android:label="@string/settings"
             android:theme="@style/AppTheme.NoActionBar" />
+        <!-- FIXME: locked screenOrientation is a workaround for https://github.com/CatimaLoyalty/Android/issues/1715, remove when https://github.com/CatimaLoyalty/Android/issues/513 is fixed -->
         <activity
             android:name=".ImportExportActivity"
             android:label="@string/importExport"
             android:exported="true"
+            android:screenOrientation="locked"
             android:theme="@style/AppTheme.NoActionBar">
 
             <!-- ZIP Intent Filter -->

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,10 +1,8 @@
 package protect.card_locker;
 
-import android.Manifest;
 import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.InputType;
@@ -14,25 +12,24 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.Toast;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.textfield.TextInputLayout;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import protect.card_locker.async.TaskHandler;
 import protect.card_locker.databinding.ImportExportActivityBinding;
 import protect.card_locker.importexport.DataFormat;
@@ -126,16 +123,19 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
             builder.setTitle(R.string.exportPassword);
 
             FrameLayout container = new FrameLayout(ImportExportActivity.this);
-            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-            params.leftMargin = 50;
-            params.rightMargin = 50;
+
+            final TextInputLayout textInputLayout = new TextInputLayout(ImportExportActivity.this);
+            textInputLayout.setEndIconMode(TextInputLayout.END_ICON_PASSWORD_TOGGLE);
+            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            params.setMargins(50, 10, 50, 0);
+            textInputLayout.setLayoutParams(params);
 
             final EditText input = new EditText(ImportExportActivity.this);
             input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-            input.setLayoutParams(params);
             input.setHint(R.string.exportPasswordHint);
 
-            container.addView(input);
+            textInputLayout.addView(input);
+            container.addView(textInputLayout);
             builder.setView(container);
             builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
                 exportPassword = input.getText().toString();
@@ -148,7 +148,6 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
             });
             builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
             builder.show();
-
         });
 
         // Check that there is a file manager available
@@ -320,9 +319,21 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
         AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
         builder.setTitle(R.string.passwordRequired);
 
-        final EditText input = new EditText(this);
+        FrameLayout container = new FrameLayout(ImportExportActivity.this);
+
+        final TextInputLayout textInputLayout = new TextInputLayout(ImportExportActivity.this);
+        textInputLayout.setEndIconMode(TextInputLayout.END_ICON_PASSWORD_TOGGLE);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        params.setMargins(50, 10, 50, 0);
+        textInputLayout.setLayoutParams(params);
+
+        final EditText input = new EditText(ImportExportActivity.this);
         input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-        builder.setView(input);
+        input.setHint(R.string.exportPasswordHint);
+
+        textInputLayout.addView(input);
+        container.addView(textInputLayout);
+        builder.setView(container);
 
         builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
             openFileForImport(uri, input.getText().toString().toCharArray());

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

@@ -4,13 +4,13 @@ import android.database.Cursor;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.math.BigDecimal;
 import java.util.Currency;
 import java.util.Date;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 public class LoyaltyCard implements Parcelable {
     public final int id;
     public final String store;

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

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

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

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

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

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

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

@@ -29,6 +29,7 @@ import android.view.Window;
 import android.view.WindowInsets;
 import android.view.WindowInsetsController;
 import android.view.WindowManager;
+import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -109,22 +110,25 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             return;
         }
 
+        ImageType imageType = imageTypes.get(mainImageIndex);
+
         // If the barcode is shown, switch to fullscreen layout
-        if (imageTypes.get(mainImageIndex) == ImageType.BARCODE) {
+        if (imageType == ImageType.BARCODE) {
             setFullscreen(true);
             return;
         }
 
         // If this is an image, open it in the gallery.
-        openCurrentMainImageInGallery();
+        openImageInGallery(imageType);
     }
 
-    private void openCurrentMainImageInGallery() {
-        ImageType wantedImageType = imageTypes.get(mainImageIndex);
-
+    private void openImageInGallery(ImageType imageType) {
         File file = null;
 
-        switch (wantedImageType) {
+        switch (imageType) {
+            case ICON:
+                file = Utils.retrieveCardImageAsFile(this, loyaltyCardId, ImageLocationType.icon);
+                break;
             case IMAGE_FRONT:
                 file = Utils.retrieveCardImageAsFile(this, loyaltyCardId, ImageLocationType.front);
                 break;
@@ -172,6 +176,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     enum ImageType {
         NONE,
+        ICON,
         BARCODE,
         IMAGE_FRONT,
         IMAGE_BACK
@@ -299,7 +304,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         binding.bottomAppBarNextButton.setOnClickListener(view -> prevNextCard(true));
         binding.bottomAppBarUpdateBalanceButton.setOnClickListener(view -> showBalanceUpdateDialog());
 
-        binding.iconContainer.setOnClickListener(view -> Toast.makeText(LoyaltyCardViewActivity.this, R.string.icon_header_click_text, Toast.LENGTH_LONG).show());
+        binding.iconContainer.setOnClickListener(view -> {
+            if (Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon) != null) {
+                openImageInGallery(ImageType.ICON);
+            } else {
+                Toast.makeText(LoyaltyCardViewActivity.this, R.string.icon_header_click_text, Toast.LENGTH_LONG).show();
+            }
+        });
         binding.iconContainer.setOnLongClickListener(view -> {
             Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
             Bundle bundle = new Bundle();
@@ -410,7 +421,11 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     private void showBalanceUpdateDialog() {
         AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+
+        // Header
         builder.setTitle(R.string.updateBalanceTitle);
+
+        // Layout
         FrameLayout container = new FrameLayout(this);
         FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
@@ -428,61 +443,91 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         currentTextview.setText(getString(R.string.currentBalanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
         layout.addView(currentTextview);
 
-        TextView updateTextView = new TextView(this);
-        updateTextView.setText(getString(R.string.newBalanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
-        layout.addView(updateTextView);
-
         final TextInputEditText input = new TextInputEditText(this);
-        Context dialogContext = this;
         input.setInputType(InputType.TYPE_CLASS_NUMBER);
         input.setKeyListener(DigitsKeyListener.getInstance("0123456789,."));
         input.setHint(R.string.updateBalanceHint);
-        input.addTextChangedListener(new SimpleTextWatcher() {
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                BigDecimal newBalance;
-                try {
-                    newBalance = calculateNewBalance(loyaltyCard.balance, loyaltyCard.balanceType, s.toString());
-                } catch (ParseException e) {
-                    input.setTag(null);
-                    updateTextView.setText(getString(R.string.newBalanceSentence, Utils.formatBalance(dialogContext, loyaltyCard.balance, loyaltyCard.balanceType)));
-                    return;
-                }
 
-                // Save new balance into this element
-                input.setTag(newBalance);
-                updateTextView.setText(getString(R.string.newBalanceSentence, Utils.formatBalance(dialogContext, newBalance, loyaltyCard.balanceType)));
-            }
-        });
         layout.addView(input);
         layout.setLayoutParams(params);
         container.addView(layout);
 
+        // Set layout
         builder.setView(container);
-        builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
-            // Grab calculated balance from input field
-            BigDecimal newBalance = (BigDecimal) input.getTag();
-            if (newBalance == null) {
-                return;
+
+        // Buttons
+        builder.setPositiveButton(R.string.spend, (dialogInterface, i) -> {
+            // Calculate and update balance
+            try {
+                BigDecimal balanceChange = Utils.parseBalance(input.getText().toString(), loyaltyCard.balanceType);
+                BigDecimal newBalance = loyaltyCard.balance.subtract(balanceChange).max(new BigDecimal(0));
+                DBHelper.updateLoyaltyCardBalance(database, loyaltyCardId, newBalance);
+            } catch (ParseException e) {
+                Toast.makeText(getApplicationContext(), R.string.amountParsingFailed, Toast.LENGTH_LONG).show();
             }
 
-            // Actually update balance
-            DBHelper.updateLoyaltyCardBalance(database, loyaltyCardId, newBalance);
-            // Reload UI
+            // Reload state
             this.onResume();
+
+            // Show new balance
+            Toast.makeText(getApplicationContext(), getString(R.string.newBalanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)), Toast.LENGTH_LONG).show();
         });
-        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
+        builder.setNegativeButton(R.string.receive, (dialogInterface, i) -> {
+            // Calculate and update balance
+            try {
+                BigDecimal balanceChange = Utils.parseBalance(input.getText().toString(), loyaltyCard.balanceType);
+                BigDecimal newBalance = loyaltyCard.balance.add(balanceChange);
+                DBHelper.updateLoyaltyCardBalance(database, loyaltyCardId, newBalance);
+            } catch (ParseException e) {
+                Toast.makeText(getApplicationContext(), R.string.amountParsingFailed, Toast.LENGTH_LONG).show();
+            }
+
+            // Reload state
+            this.onResume();
+
+            // Show new balance
+            Toast.makeText(getApplicationContext(), getString(R.string.newBalanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)), Toast.LENGTH_LONG).show();
+        });
+        builder.setNeutralButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
         AlertDialog dialog = builder.create();
+
+        // Now that the dialog exists, we can bind something that affects the buttons
+        input.addTextChangedListener(new SimpleTextWatcher() {
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                BigDecimal balanceChange;
+
+                try {
+                    balanceChange = Utils.parseBalance(s.toString(), loyaltyCard.balanceType);
+                } catch (ParseException e) {
+                    input.setError(getString(R.string.amountParsingFailed));
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+                    return;
+                }
+
+                input.setError(null);
+                if (balanceChange.equals(new BigDecimal(0))) {
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+                } else {
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+                    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(true);
+                }
+            }
+        });
+
         dialog.show();
+
+        // Disable buttons (must be done **after** dialog is shown to prevent crash
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+        dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+
+        // Set focus on input field
         dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
         input.requestFocus();
     }
 
-    private BigDecimal calculateNewBalance(BigDecimal currentBalance, Currency currency, String unparsedSubtraction) throws ParseException {
-        BigDecimal subtraction = Utils.parseBalance(unparsedSubtraction, currency);
-        return currentBalance.subtract(subtraction).max(new BigDecimal(0));
-    }
-
     private void setBottomAppBarButtonState() {
         if (!loyaltyCard.note.isEmpty() || !loyaltyCardGroups.isEmpty() || hasBalance(loyaltyCard) || loyaltyCard.validFrom != null || loyaltyCard.expiry != null) {
             binding.bottomAppBarInfoButton.setVisibility(View.VISIBLE);
@@ -691,6 +736,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         DBHelper.updateLoyaltyCardLastUsed(database, loyaltyCard.id);
 
         invalidateOptionsMenu();
+
+        ShortcutHelper.updateShortcuts(this, loyaltyCard);
     }
 
     private void setStateBasedOnImageTypes() {
@@ -790,6 +837,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             DBHelper.updateLoyaltyCardArchiveStatus(database, loyaltyCardId, 1);
             Toast.makeText(LoyaltyCardViewActivity.this, R.string.archived, Toast.LENGTH_LONG).show();
 
+            ShortcutHelper.removeShortcut(LoyaltyCardViewActivity.this, loyaltyCardId);
+
             // Re-init loyaltyCard with new data from DB
             onResume();
             invalidateOptionsMenu();

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

@@ -7,8 +7,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.CursorIndexOutOfBoundsException;
 import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Bitmap;
-import android.net.Uri;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -33,7 +31,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
 
-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -150,6 +147,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
                     Log.d(TAG, "Archiving card: " + loyaltyCard.id);
                     DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id, 1);
+                    ShortcutHelper.removeShortcut(MainActivity.this, loyaltyCard.id);
                     updateLoyaltyCardList(false);
                     inputMode.finish();
                     invalidateOptionsMenu();
@@ -194,10 +192,12 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
     @Override
     protected void onCreate(Bundle inputSavedInstanceState) {
-        extractIntentFields(getIntent());
         SplashScreen.installSplashScreen(this);
         super.onCreate(inputSavedInstanceState);
 
+        // We should extract the share intent after we called the super.onCreate as it may need to spawn a dialog window and the app needs to be initialized to not crash
+        extractIntentFields(getIntent());
+
         binding = MainActivityBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
@@ -287,11 +287,11 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             }
 
             Intent intent = result.getData();
-            BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(Utils.BARCODE_SCAN, result.getResultCode(), intent, this);
+            List<BarcodeValues> barcodeValuesList = Utils.parseSetBarcodeActivityResult(Utils.BARCODE_SCAN, result.getResultCode(), intent, this);
 
             Bundle inputBundle = intent.getExtras();
             String group = inputBundle != null ? inputBundle.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP) : null;
-            processBarcodeValues(barcodeValues, group);
+            processBarcodeValuesList(barcodeValuesList, group, false);
         });
 
         mSettingsLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
@@ -446,63 +446,57 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
     }
 
-    private void processBarcodeValues(BarcodeValues barcodeValues, String group) {
-        if (barcodeValues.isEmpty()) {
+    private void processBarcodeValuesList(List<BarcodeValues> barcodeValuesList, String group, boolean closeAppOnNoBarcode) {
+        if (barcodeValuesList.isEmpty()) {
             throw new IllegalArgumentException("barcodesValues may not be empty");
         }
 
-        Intent newIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-        Bundle newBundle = new Bundle();
-        newBundle.putString(LoyaltyCardEditActivity.BUNDLE_BARCODETYPE, barcodeValues.format());
-        newBundle.putString(LoyaltyCardEditActivity.BUNDLE_CARDID, barcodeValues.content());
-        if (group != null) {
-            newBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, group);
-        }
-        newIntent.putExtras(newBundle);
-        startActivity(newIntent);
+        Utils.makeUserChooseBarcodeFromList(MainActivity.this, barcodeValuesList, new BarcodeValuesListDisambiguatorCallback() {
+            @Override
+            public void onUserChoseBarcode(BarcodeValues barcodeValues) {
+                Intent newIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                Bundle newBundle = new Bundle();
+                newBundle.putString(LoyaltyCardEditActivity.BUNDLE_BARCODETYPE, barcodeValues.format());
+                newBundle.putString(LoyaltyCardEditActivity.BUNDLE_CARDID, barcodeValues.content());
+                if (group != null) {
+                    newBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, group);
+                }
+                newIntent.putExtras(newBundle);
+                startActivity(newIntent);
+            }
+
+            @Override
+            public void onUserDismissedSelector() {
+                if (closeAppOnNoBarcode) {
+                    finish();
+                }
+            }
+        });
     }
 
     private void onSharedIntent(Intent intent) {
         String receivedAction = intent.getAction();
         String receivedType = intent.getType();
 
-        // Check if an image was shared to us
+        // Check if an image or file was shared to us
         if (Intent.ACTION_SEND.equals(receivedAction)) {
-            if (!receivedType.startsWith("image/")) {
+            List<BarcodeValues> barcodeValuesList;
+
+            if (receivedType.startsWith("image/")) {
+                barcodeValuesList = Utils.retrieveBarcodesFromImage(this, intent.getParcelableExtra(Intent.EXTRA_STREAM));
+            } else if (receivedType.equals("application/pdf")) {
+                barcodeValuesList = Utils.retrieveBarcodesFromPdf(this, intent.getParcelableExtra(Intent.EXTRA_STREAM));
+            } else {
                 Log.e(TAG, "Wrong mime-type");
                 return;
             }
 
-            BarcodeValues barcodeValues;
-            Bitmap bitmap;
-
-            Uri data = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-            if (data == null) {
-                Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+            if (barcodeValuesList.isEmpty()) {
                 finish();
                 return;
             }
 
-            try {
-                bitmap = Utils.retrieveImageFromUri(this, data);
-            } catch (IOException e) {
-                Log.e(TAG, "Error getting data from image file");
-                e.printStackTrace();
-                Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                finish();
-                return;
-            }
-
-            barcodeValues = Utils.getBarcodeFromBitmap(bitmap);
-
-            if (barcodeValues.isEmpty()) {
-                Log.i(TAG, "No barcode found in image file");
-                Toast.makeText(this, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
-                finish();
-                return;
-            }
-
-            processBarcodeValues(barcodeValues, null);
+            processBarcodeValuesList(barcodeValuesList, null, true);
         }
     }
 
@@ -798,8 +792,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             b.putIntegerArrayList("cardList", cardList);
             intent.putExtras(b);
 
-            ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard);
-
             startActivity(intent);
         }
     }

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

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

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

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

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

@@ -32,7 +32,6 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
-
 import androidx.core.content.ContextCompat;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -63,6 +62,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
     private static final int COMPAT_SCALE_FACTOR_DIP = 320;
 
     private static final int PERMISSION_SCAN_ADD_FROM_IMAGE = 100;
+    private static final int PERMISSION_SCAN_ADD_FROM_PDF = 101;
 
     private CaptureManager capture;
     private DecoratedBarcodeView barcodeScannerView;
@@ -74,6 +74,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
     private ActivityResultLauncher<Intent> manualAddLauncher;
     // can't use the pre-made contract because that launches the file manager for image type instead of gallery
     private ActivityResultLauncher<Intent> photoPickerLauncher;
+    private ActivityResultLauncher<Intent> pdfPickerLauncher;
 
     static final String STATE_SCANNER_ACTIVE = "scannerActive";
     private boolean mScannerActive = true;
@@ -100,6 +101,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
 
         manualAddLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.SELECT_BARCODE_REQUEST, result.getResultCode(), result.getData()));
         photoPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_IMAGE_FILE, result.getResultCode(), result.getData()));
+        pdfPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_PDF_FILE, result.getResultCode(), result.getData()));
         customBarcodeScannerBinding.fabOtherOptions.setOnClickListener(view -> {
             setScannerActive(false);
 
@@ -109,7 +111,8 @@ public class ScanActivity extends CatimaAppCompatActivity {
                     new CharSequence[]{
                             getString(R.string.addWithoutBarcode),
                             getString(R.string.addManually),
-                            getString(R.string.addFromImage)
+                            getString(R.string.addFromImage),
+                            getString(R.string.addFromPdfFile)
                     },
                     (dialogInterface, i) -> {
                         switch (i) {
@@ -122,6 +125,9 @@ public class ScanActivity extends CatimaAppCompatActivity {
                             case 2:
                                 addFromImage();
                                 break;
+                            case 3:
+                                addFromPdfFile();
+                                break;
                             default:
                                 throw new IllegalArgumentException("Unknown 'Add a card in a different way' dialog option");
                         }
@@ -269,14 +275,24 @@ public class ScanActivity extends CatimaAppCompatActivity {
     private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
         super.onActivityResult(requestCode, resultCode, intent);
 
-        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
+        List<BarcodeValues> barcodeValuesList = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
 
-        if (barcodeValues.isEmpty()) {
+        if (barcodeValuesList.isEmpty()) {
             setScannerActive(true);
             return;
         }
 
-        returnResult(barcodeValues.content(), barcodeValues.format());
+        Utils.makeUserChooseBarcodeFromList(this, barcodeValuesList, new BarcodeValuesListDisambiguatorCallback() {
+            @Override
+            public void onUserChoseBarcode(BarcodeValues barcodeValues) {
+                returnResult(barcodeValues.content(), barcodeValues.format());
+            }
+
+            @Override
+            public void onUserDismissedSelector() {
+                setScannerActive(true);
+            }
+        });
     }
 
     private void addWithoutBarcode() {
@@ -344,32 +360,44 @@ public class ScanActivity extends CatimaAppCompatActivity {
     }
 
     public void addManually() {
-        Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
-        if (cardId != null) {
-            final Bundle b = new Bundle();
-            b.putString("initialCardId", cardId);
-            i.putExtras(b);
-        }
-        manualAddLauncher.launch(i);
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ScanActivity.this);
+        builder.setTitle(R.string.add_manually_warning_title);
+        builder.setMessage(R.string.add_manually_warning_message);
+        builder.setPositiveButton(R.string.continue_, (dialog, which) -> {
+            Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
+            if (cardId != null) {
+                final Bundle b = new Bundle();
+                b.putString("initialCardId", cardId);
+                i.putExtras(b);
+            }
+            manualAddLauncher.launch(i);
+        });
+        builder.setNegativeButton(R.string.cancel, (dialog, which) -> setScannerActive(true));
+        builder.setOnCancelListener(dialog -> setScannerActive(true));
+        builder.show();
     }
 
     public void addFromImage() {
         PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_IMAGE);
     }
 
-    private void addFromImageAfterPermission() {
-        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
-        photoPickerIntent.setType("image/*");
-        Intent contentIntent = new Intent(Intent.ACTION_GET_CONTENT);
-        contentIntent.setType("image/*");
+    public void addFromPdfFile() {
+        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_PDF);
+    }
 
-        Intent chooserIntent = Intent.createChooser(photoPickerIntent, getString(R.string.addFromImage));
+    private void addFromImageOrFileAfterPermission(String mimeType, ActivityResultLauncher<Intent> launcher, int chooserText, int errorMessage) {
+        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
+        photoPickerIntent.setType(mimeType);
+        Intent contentIntent = new Intent(Intent.ACTION_GET_CONTENT);
+        contentIntent.setType(mimeType);
+
+        Intent chooserIntent = Intent.createChooser(photoPickerIntent, getString(chooserText));
         chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] { contentIntent });
         try {
-            photoPickerLauncher.launch(chooserIntent);
+            launcher.launch(chooserIntent);
         } catch (ActivityNotFoundException e) {
             setScannerActive(true);
-            Toast.makeText(getApplicationContext(), R.string.failedLaunchingPhotoPicker, Toast.LENGTH_LONG).show();
+            Toast.makeText(getApplicationContext(), errorMessage, Toast.LENGTH_LONG).show();
             Log.e(TAG, "No activity found to handle intent", e);
         }
     }
@@ -417,9 +445,13 @@ public class ScanActivity extends CatimaAppCompatActivity {
 
         if (requestCode == CaptureManager.getCameraPermissionReqCode()) {
             showCameraPermissionMissingText(!granted);
-        } else if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE) {
+        } else if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE || requestCode == PERMISSION_SCAN_ADD_FROM_PDF) {
             if (granted) {
-                addFromImageAfterPermission();
+                if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE) {
+                    addFromImageOrFileAfterPermission("image/*", photoPickerLauncher, R.string.addFromImage, R.string.failedLaunchingPhotoPicker);
+                } else {
+                    addFromImageOrFileAfterPermission("application/pdf", pdfPickerLauncher, R.string.addFromPdfFile, R.string.failedLaunchingFileManager);
+                }
             } else {
                 setScannerActive(true);
                 Toast.makeText(this, R.string.storageReadPermissionRequired, Toast.LENGTH_LONG).show();

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

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

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

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

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

@@ -12,8 +12,10 @@ import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.ImageDecoder;
 import android.graphics.Matrix;
+import android.graphics.pdf.PdfRenderer;
 import android.net.Uri;
 import android.os.Build;
+import android.os.ParcelFileDescriptor;
 import android.provider.MediaStore;
 import android.text.Layout;
 import android.text.Spanned;
@@ -39,6 +41,7 @@ import androidx.exifinterface.media.ExifInterface;
 import androidx.palette.graphics.Palette;
 
 import com.google.android.material.color.DynamicColors;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.LuminanceSource;
 import com.google.zxing.MultiFormatReader;
@@ -46,6 +49,8 @@ import com.google.zxing.NotFoundException;
 import com.google.zxing.RGBLuminanceSource;
 import com.google.zxing.Result;
 import com.google.zxing.common.HybridBinarizer;
+import com.google.zxing.multi.GenericMultipleBarcodeReader;
+import com.google.zxing.multi.MultipleBarcodeReader;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
@@ -64,6 +69,7 @@ import java.text.NumberFormat;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Currency;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -83,12 +89,13 @@ public class Utils {
     public static final int SELECT_BARCODE_REQUEST = 2;
     public static final int BARCODE_SCAN = 3;
     public static final int BARCODE_IMPORT_FROM_IMAGE_FILE = 4;
-    public static final int CARD_IMAGE_FROM_CAMERA_FRONT = 5;
-    public static final int CARD_IMAGE_FROM_CAMERA_BACK = 6;
-    public static final int CARD_IMAGE_FROM_CAMERA_ICON = 7;
-    public static final int CARD_IMAGE_FROM_FILE_FRONT = 8;
-    public static final int CARD_IMAGE_FROM_FILE_BACK = 9;
-    public static final int CARD_IMAGE_FROM_FILE_ICON = 10;
+    public static final int BARCODE_IMPORT_FROM_PDF_FILE = 5;
+    public static final int CARD_IMAGE_FROM_CAMERA_FRONT = 6;
+    public static final int CARD_IMAGE_FROM_CAMERA_BACK = 7;
+    public static final int CARD_IMAGE_FROM_CAMERA_ICON = 8;
+    public static final int CARD_IMAGE_FROM_FILE_FRONT = 9;
+    public static final int CARD_IMAGE_FROM_FILE_BACK = 10;
+    public static final int CARD_IMAGE_FROM_FILE_ICON = 11;
 
     public static final String CARD_IMAGE_FILENAME_REGEX = "^(card_)(\\d+)(_(?:front|back|icon)\\.png)$";
 
@@ -131,6 +138,80 @@ public class Utils {
         return ColorUtils.calculateLuminance(backgroundColor) > LUMINANCE_MIDPOINT;
     }
 
+    static public List<BarcodeValues> retrieveBarcodesFromImage(Context context, Uri uri) {
+        Log.i(TAG, "Received image file with possible barcode");
+
+        if (uri == null) {
+            Log.e(TAG, "Uri did not contain any data");
+            Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        Bitmap bitmap;
+        try {
+            bitmap = retrieveImageFromUri(context, uri);
+        } catch (IOException e) {
+            Log.e(TAG, "Error getting data from image file");
+            e.printStackTrace();
+            Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        List<BarcodeValues> barcodesFromBitmap = getBarcodesFromBitmap(bitmap);
+
+        if (barcodesFromBitmap.isEmpty()) {
+            Log.i(TAG, "No barcode found in image file");
+            Toast.makeText(context, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
+        }
+
+        return barcodesFromBitmap;
+    }
+
+    static public List<BarcodeValues> retrieveBarcodesFromPdf(Context context, Uri uri) {
+        Log.i(TAG, "Received PDF file with possible barcode");
+
+        if (uri == null) {
+            Log.e(TAG, "Uri did not contain any data");
+            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        ParcelFileDescriptor parcelFileDescriptor;
+        PdfRenderer renderer;
+        try {
+            parcelFileDescriptor = context.getContentResolver().openFileDescriptor(uri, "r");
+            renderer = new PdfRenderer(parcelFileDescriptor);
+        } catch (IOException e) {
+            Log.e(TAG, "Could not read file in uri");
+            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        // Loop over all pages to find barcodes
+        List<BarcodeValues> barcodesFromPdfPages = new ArrayList<>();
+        Bitmap renderedPage;
+        for (int i = 0; i < renderer.getPageCount(); i++) {
+            PdfRenderer.Page page = renderer.openPage(i);
+            renderedPage = Bitmap.createBitmap(page.getWidth(), page.getHeight(), Bitmap.Config.ARGB_8888);
+            page.render(renderedPage, null, null, PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY);
+            page.close();
+
+            List<BarcodeValues> barcodesFromPage = getBarcodesFromBitmap(renderedPage);
+            for (BarcodeValues barcodeValues : barcodesFromPage) {
+                barcodeValues.setNote(String.format(context.getString(R.string.pageWithNumber), i+1));
+                barcodesFromPdfPages.add(barcodeValues);
+            }
+        }
+        renderer.close();
+
+        if (barcodesFromPdfPages.isEmpty()) {
+            Log.i(TAG, "No barcode found in pdf file");
+            Toast.makeText(context, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
+        }
+
+        return barcodesFromPdfPages;
+    }
+
     /**
      * Returns the Barcode format and content based on the result of an activity.
      * It shows toasts to notify the end-user as needed itself and will return an empty
@@ -142,45 +223,20 @@ public class Utils {
      * @param context
      * @return BarcodeValues
      */
-    static public BarcodeValues parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
+    static public List<BarcodeValues> parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
         String contents;
         String format;
 
         if (resultCode != Activity.RESULT_OK) {
-            return new BarcodeValues(null, null);
+            return new ArrayList<>();
         }
 
         if (requestCode == Utils.BARCODE_IMPORT_FROM_IMAGE_FILE) {
-            Log.i(TAG, "Received image file with possible barcode");
+            return retrieveBarcodesFromImage(context, intent.getData());
+        }
 
-            Uri data = intent.getData();
-            if (data == null) {
-                Log.e(TAG, "Intent did not contain any data");
-                Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                return new BarcodeValues(null, null);
-            }
-
-            Bitmap bitmap;
-            try {
-                bitmap = retrieveImageFromUri(context, data);
-            } catch (IOException e) {
-                Log.e(TAG, "Error getting data from image file");
-                e.printStackTrace();
-                Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                return new BarcodeValues(null, null);
-            }
-
-            BarcodeValues barcodeFromBitmap = getBarcodeFromBitmap(bitmap);
-
-            if (barcodeFromBitmap.isEmpty()) {
-                Log.i(TAG, "No barcode found in image file");
-                Toast.makeText(context, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
-            }
-
-            Log.i(TAG, "Read barcode id: " + barcodeFromBitmap.content());
-            Log.i(TAG, "Read format: " + barcodeFromBitmap.format());
-
-            return barcodeFromBitmap;
+        if (requestCode == Utils.BARCODE_IMPORT_FROM_PDF_FILE) {
+            return retrieveBarcodesFromPdf(context, intent.getData());
         }
 
         if (requestCode == Utils.BARCODE_SCAN || requestCode == Utils.SELECT_BARCODE_REQUEST) {
@@ -196,7 +252,7 @@ public class Utils {
             Log.i(TAG, "Read barcode id: " + contents);
             Log.i(TAG, "Read format: " + format);
 
-            return new BarcodeValues(format, contents);
+            return Collections.singletonList(new BarcodeValues(format, contents));
         }
 
         throw new UnsupportedOperationException("Unknown request code for parseSetBarcodeActivityResult");
@@ -216,22 +272,22 @@ public class Utils {
         return MediaStore.Images.Media.getBitmap(context.getContentResolver(), data);
     }
 
-    static public BarcodeValues getBarcodeFromBitmap(Bitmap bitmap) {
+    static public List<BarcodeValues> getBarcodesFromBitmap(Bitmap bitmap) {
         // This function is vulnerable to OOM, so we try again with a smaller bitmap is we get OOM
         for (int i = 0; i < 10; i++) {
             try {
-                return Utils.getBarcodeFromBitmapReal(bitmap);
+                return Utils.getBarcodesFromBitmapReal(bitmap);
             } catch (OutOfMemoryError e) {
-                Log.w(TAG, "Ran OOM in getBarcodeFromBitmap! Trying again with smaller picture! Retry " + i + " of 10.");
+                Log.w(TAG, "Ran OOM in getBarcodesFromBitmap! Trying again with smaller picture! Retry " + i + " of 10.");
                 bitmap = Bitmap.createScaledBitmap(bitmap, (int) Math.round(0.75 * bitmap.getWidth()), (int) Math.round(0.75 * bitmap.getHeight()), false);
             }
         }
 
         // Give up
-        return new BarcodeValues(null, null);
+        return new ArrayList<>();
     }
 
-    static private BarcodeValues getBarcodeFromBitmapReal(Bitmap bitmap) {
+    static private List<BarcodeValues> getBarcodesFromBitmapReal(Bitmap bitmap) {
         // In order to decode it, the Bitmap must first be converted into a pixel array...
         int[] intArray = new int[bitmap.getWidth() * bitmap.getHeight()];
         bitmap.getPixels(intArray, 0, bitmap.getWidth(), 0, 0, bitmap.getWidth(), bitmap.getHeight());
@@ -240,15 +296,63 @@ public class Utils {
         LuminanceSource source = new RGBLuminanceSource(bitmap.getWidth(), bitmap.getHeight(), intArray);
         BinaryBitmap binaryBitmap = new BinaryBitmap(new HybridBinarizer(source));
 
+        List<BarcodeValues> barcodeValuesList = new ArrayList<>();
         try {
-            Result barcodeResult = new MultiFormatReader().decode(binaryBitmap);
+            MultiFormatReader multiFormatReader = new MultiFormatReader();
+            MultipleBarcodeReader multipleBarcodeReader = new GenericMultipleBarcodeReader(multiFormatReader);
 
-            return new BarcodeValues(barcodeResult.getBarcodeFormat().name(), barcodeResult.getText());
+            Result[] barcodeResults = multipleBarcodeReader.decodeMultiple(binaryBitmap);
+
+            for (Result barcodeResult : barcodeResults) {
+                Log.i(TAG, "Read barcode id: " + barcodeResult.getText());
+                Log.i(TAG, "Read format: " + barcodeResult.getBarcodeFormat().name());
+
+                barcodeValuesList.add(new BarcodeValues(barcodeResult.getBarcodeFormat().name(), barcodeResult.getText()));
+            }
+
+            return barcodeValuesList;
         } catch (NotFoundException e) {
-            return new BarcodeValues(null, null);
+            return barcodeValuesList;
         }
     }
 
+    static public void makeUserChooseBarcodeFromList(Context context, List<BarcodeValues> barcodeValuesList, BarcodeValuesListDisambiguatorCallback callback) {
+        // If there is only one choice, consider it chosen
+        if (barcodeValuesList.size() == 1) {
+            callback.onUserChoseBarcode(barcodeValuesList.get(0));
+            return;
+        }
+
+        // Ask user to choose a barcode
+        // TODO: This should contain an image of the barcode in question to help users understand the choice they're making
+        CharSequence[] barcodeDescriptions = new CharSequence[barcodeValuesList.size()];
+        for (int i = 0; i < barcodeValuesList.size(); i++) {
+            BarcodeValues barcodeValues = barcodeValuesList.get(i);
+            CatimaBarcode catimaBarcode = CatimaBarcode.fromName(barcodeValues.format());
+
+            String barcodeContent = barcodeValues.content();
+            // Shorten overly long barcodes
+            if (barcodeContent.length() > 22) {
+                barcodeContent = barcodeContent.substring(0, 20) + "…";
+            }
+
+            if (barcodeValues.note() != null) {
+                barcodeDescriptions[i] = String.format("%s: %s (%s)", barcodeValues.note(), catimaBarcode.prettyName(), barcodeContent);
+            } else {
+                barcodeDescriptions[i] = String.format("%s (%s)", catimaBarcode.prettyName(), barcodeContent);
+            }
+        }
+
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context);
+        builder.setTitle(context.getString(R.string.multipleBarcodesFoundPleaseChooseOne));
+        builder.setItems(
+                barcodeDescriptions,
+                (dialogInterface, i) -> callback.onUserChoseBarcode(barcodeValuesList.get(i))
+        );
+        builder.setOnCancelListener(dialogInterface -> callback.onUserDismissedSelector());
+        builder.show();
+    }
+
     static public Boolean isNotYetValid(Date validFromDate) {
         // The note in `hasExpired` does not apply here, since the bug was fixed before this feature was added.
         return validFromDate.after(getStartOfToday().getTime());
@@ -748,23 +852,30 @@ public class Utils {
                 .replaceAll("(?<!href=\")\\b(https?://[\\w@#%&+=:?/.-]*[\\w@#%&+=:?/-])", "<a href=\"$1\">$1</a>");
     }
 
-    public static void setIconOrTextWithBackground(Context context, LoyaltyCard loyaltyCard, Bitmap icon, ImageView backgroundOrIcon, TextView textWhenNoImage) {
-        if (icon != null) {
-            Log.d("onResume", "setting icon image");
-            textWhenNoImage.setVisibility(View.GONE);
+    /**
+     * Sets an icon or text with background on the given ImageView and/or TextView, including background colour.
+     *
+     * @param context Android context
+     * @param loyaltyCard Loyalty Card
+     * @param icon Bitmap of the icon to set, or null
+     * @param backgroundOrIcon ImageView to draw the icon and background on to
+     * @param textWhenNoImage TextView to write the loyalty card name into if icon is null
+     * @return background colour
+     */
+    public static int setIconOrTextWithBackground(Context context, LoyaltyCard loyaltyCard, Bitmap icon, ImageView backgroundOrIcon, TextView textWhenNoImage) {
+        int headerColor = getHeaderColor(context, loyaltyCard);
+        backgroundOrIcon.setImageBitmap(icon);
+        backgroundOrIcon.setBackgroundColor(headerColor);
 
-            backgroundOrIcon.setImageBitmap(icon);
-            backgroundOrIcon.setBackgroundColor(Color.TRANSPARENT);
+        if (icon != null) {
+            textWhenNoImage.setVisibility(View.GONE);
         } else {
             textWhenNoImage.setVisibility(View.VISIBLE);
-
-            int headerColor = getHeaderColor(context, loyaltyCard);
-
-            backgroundOrIcon.setImageBitmap(null);
-            backgroundOrIcon.setBackgroundColor(headerColor);
             textWhenNoImage.setText(loyaltyCard.store);
             textWhenNoImage.setTextColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
         }
+
+        return headerColor;
     }
 
     public static boolean installedFromGooglePlay(Context context) {

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

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

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

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

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

@@ -369,75 +369,106 @@
                 android:visibility="gone"
                 tools:visibility="visible">
 
-                <!-- Front image -->
                 <LinearLayout
-                    android:id="@+id/frontImageHolder"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
-                    android:paddingHorizontal="@dimen/inputPadding"
-                    android:paddingTop="@dimen/inputPadding">
+                    android:baselineAligned="false">
 
                     <!-- Front image -->
                     <com.google.android.material.card.MaterialCardView
-                        android:layout_width="match_parent"
+                        android:id="@+id/frontImageHolder"
+                        android:layout_weight="1"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginStart="@dimen/activity_margin"
-                        android:layout_marginTop="@dimen/activity_margin"
-                        android:layout_marginEnd="@dimen/activity_margin"
-                        android:layout_marginBottom="@dimen/activity_margin"
-                        android:paddingHorizontal="@dimen/inputPadding"
-                        app:cardCornerRadius="4dp"
-                        app:cardElevation="0dp">
+                        android:orientation="horizontal"
+                        android:layout_margin="5dp"
+                        style="?attr/materialCardViewElevatedStyle">
 
-                        <ImageView
-                            android:id="@+id/frontImage"
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/frontImageConstraint"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:adjustViewBounds="true"
-                            android:minHeight="50dp"
-                            android:contentDescription="@string/frontImageDescription"
-                            android:scaleType="fitCenter"
-                            app:srcCompat="@drawable/ic_camera_white"
-                            android:background="?attr/colorPrimary" />
+                            android:layout_height="wrap_content">
 
+                            <!-- Back image -->
+                            <ImageView
+                                android:id="@+id/frontImage"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:adjustViewBounds="true"
+                                android:minHeight="50dp"
+                                android:contentDescription="@string/backImageDescription"
+                                android:scaleType="fitCenter"
+                                app:srcCompat="@drawable/ic_camera_white"
+                                android:background="?attr/colorPrimary"
+                                app:layout_constraintBottom_toTopOf="@id/frontImageDescription"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
+
+                            <TextView
+                                android:id="@+id/frontImageDescription"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="8dp"
+                                android:layout_marginEnd="8dp"
+                                android:layout_marginBottom="4dp"
+                                android:text="@string/frontImageDescription"
+                                android:textAppearance="?attr/textAppearanceHeadlineSmall"
+                                android:gravity="center"
+                                app:layout_constraintTop_toBottomOf="@id/frontImage"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"/>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
                     </com.google.android.material.card.MaterialCardView>
-                </LinearLayout>
-
-                <!-- Back image -->
-                <LinearLayout
-                    android:id="@+id/backImageHolder"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingHorizontal="@dimen/inputPadding"
-                    android:paddingTop="@dimen/inputPadding">
 
                     <!-- Back image -->
                     <com.google.android.material.card.MaterialCardView
-                        android:layout_width="match_parent"
+                        android:layout_weight="1"
+                        android:id="@+id/backImageHolder"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginStart="@dimen/activity_margin"
-                        android:layout_marginTop="@dimen/activity_margin"
-                        android:layout_marginEnd="@dimen/activity_margin"
-                        android:layout_marginBottom="@dimen/activity_margin"
-                        android:paddingHorizontal="@dimen/inputPadding"
-                        app:cardCornerRadius="4dp"
-                        app:cardElevation="0dp">
+                        android:orientation="horizontal"
+                        android:layout_margin="5dp"
+                        style="?attr/materialCardViewElevatedStyle">
 
-                        <ImageView
-                            android:id="@+id/backImage"
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/backImageConstraint"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:adjustViewBounds="true"
-                            android:minHeight="50dp"
-                            android:contentDescription="@string/backImageDescription"
-                            android:scaleType="fitCenter"
-                            app:srcCompat="@drawable/ic_camera_white"
-                            android:background="?attr/colorPrimary" />
+                            android:layout_height="wrap_content">
 
+                            <!-- Back image -->
+                            <ImageView
+                                android:id="@+id/backImage"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:adjustViewBounds="true"
+                                android:minHeight="50dp"
+                                android:contentDescription="@string/backImageDescription"
+                                android:scaleType="fitCenter"
+                                app:srcCompat="@drawable/ic_camera_white"
+                                android:background="?attr/colorPrimary"
+                                app:layout_constraintBottom_toTopOf="@id/backImageDescription"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
+
+                            <TextView
+                                android:id="@+id/backImageDescription"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="8dp"
+                                android:layout_marginEnd="8dp"
+                                android:layout_marginBottom="4dp"
+                                android:text="@string/backImageDescription"
+                                android:textAppearance="?attr/textAppearanceHeadlineSmall"
+                                android:gravity="center"
+                                app:layout_constraintTop_toBottomOf="@id/backImage"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"/>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
                     </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>
             </TableLayout>

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

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/coordinator_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

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

@@ -1,11 +1,11 @@
 Sylvia van Os
 Branden Archer
 J. Lavoie
-Allan Nordhøy
 solokot
+Allan Nordhøy
 Heimen Stoffels
-FC (Fay) Stegerman
 Oğuz Ersen
+FC (Fay) Stegerman
 Katharine Chui
 SlavekB
 StoyanDimitrov
@@ -24,25 +24,29 @@ Aayush Gupta
 HudobniVolk
 Nyatsuki
 Samantaz Fox
+Giovanni Donisi
+Jiri Grönroos
 arno-github
 Cliff Heraldo
 Sergio Paredes
 Ankit Tiwari
 Milan Šalka
+mdvhimself
 Balázs Meskó
-Giovanni Donisi
-Jiri Grönroos
 Milo Ivir
 Skrripy
 huuhaa
+大王叫我来巡山
 Projjal Moitra
 Quentin PAGÈS
+ikanakova
 waffshappen
-Eryk Michalak
+ngocanhtve
 Ziad OUALHADJ
+Scrambled777
 Robin Liu
-mdvhimself
 Denis Shilin
+Alexander Ivanov
 Miha Frangež
 Silvério Santos
 Virginie
@@ -52,4 +56,3 @@ Kim Seohyun
 Govind S Nair
 Freddo espresso
 arshbeerSingh
-Alexander Ivanov

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

@@ -251,7 +251,7 @@
     <string name="barcodeLongPressMessage">يمكن فتح صور فقط في تطبيق معرض الصور</string>
     <string name="failedToOpenUrl">ثبت متصفح ويب أولاً</string>
     <string name="welcome">مرحبا بك في كاتيما</string>
-    <string name="updateBalanceTitle">كم أنفقت؟</string>
+    <string name="updateBalanceTitle">كم أنفقت أو استلمت؟</string>
     <string name="currentBalanceSentence">الرصيد الحالي: <xliff:g> %s </xliff:g></string>
     <plurals name="viewArchivedCardsWithCount">
         <item quantity="zero">عرض الأرشيف (<xliff:g>%1$d</xliff:g> بطاقة)</item>
@@ -312,4 +312,10 @@
     <string name="field_must_not_be_empty">يجب ألا يكون الحقل فارغا</string>
     <string name="app_name">كاتيما</string>
     <string name="settings_follow_sensor_orientation">التدوير دائمًا ( تجاهل إعدادات النظام)</string>
+    <string name="add_manually_warning_title">الفحص موصى به</string>
+    <string name="continue_">استمر</string>
+    <string name="spend">انفق</string>
+    <string name="receive">استلم</string>
+    <string name="amountParsingFailed">كمية غير صحيحة</string>
+    <string name="add_manually_warning_message">في بعض المتاجر قيمة الباركود تختلف عن الرقم الموجود على البطاقة. لهذا السبب إدخال الباركود يدوياً لن ينجح دائماً. من المستحسن فحص الباركود بكاميرا بدلا من ذالك. هل انت مُصِر على الاستكمال؟</string>
 </resources>

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

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

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

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

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

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

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

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

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

@@ -231,7 +231,7 @@
     <string name="welcome">Willkommen bei Catima</string>
     <string name="barcodeLongPressMessage">In der Galerie können nur Bilder geöffnet werden</string>
     <string name="failedToRetrieveImageFile">Bilddatei konnte nicht abgerufen werden</string>
-    <string name="updateBalanceTitle">Wie viel haben Sie ausgegeben\?</string>
+    <string name="updateBalanceTitle">Wie viel hast du ausgegeben oder erhalten?</string>
     <string name="cameraPermissionDeniedTitle">Kein Zugriff auf die Kamera möglich</string>
     <string name="noCameraPermissionDirectToSystemSetting">Um Strichcodes zu scannen, benötigt Catima Zugriff auf Ihre Kamera. Tippen Sie hier, um Ihre Berechtigungseinstellungen zu ändern.</string>
     <string name="updateBalanceHint">Betrag eingeben</string>
@@ -284,4 +284,10 @@
     <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>
+    <string name="continue_">Fortfahren</string>
+    <string name="add_manually_warning_title">Es wird empfohlen, zu scannen</string>
+    <string name="add_manually_warning_message">In einigen Geschäften weicht der Wert des Barcodes von dem auf der Karte angegebenen Wert ab. Aus diesem Grund funktioniert die manuelle Eingabe des Barcodes in einigen Fällen nicht. Es wird dringend empfohlen, den Barcode mit einer Kamera zu scannen. Möchtest du dennoch fortfahren?</string>
+    <string name="spend">Zahlen</string>
+    <string name="receive">Erhalten</string>
+    <string name="amountParsingFailed">Ungültiger Betrag</string>
 </resources>

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

@@ -222,7 +222,7 @@
     <string name="archived">Η κάρτα αρχειοθετήθηκε</string>
     <string name="unarchived">Η κάρτα αφαιρέθηκε από το αρχείο</string>
     <string name="unarchive">Αφαίρεση από το αρχείο</string>
-    <string name="updateBalanceTitle">Πόσα ξοδέψατε;</string>
+    <string name="updateBalanceTitle">Πόσα ξοδέψατε ή λάβατε;</string>
     <string name="cameraPermissionDeniedTitle">Αδύνατη η πρόσβαση στην κάμερα</string>
     <string name="failedToRetrieveImageFile">Αποτυχία ανάκτησης αρχείου εικόνας</string>
     <string name="previousCard">Προηγούμενη</string>
@@ -242,6 +242,26 @@
     <string name="welcome">Καλώς ήρθατε στο Catima</string>
     <string name="settings_disable_lockscreen_while_viewing_card_summary">Απενεργοποιεί το κλείδωμα οθόνης ενόσω βλέπετε μια κάρτα</string>
     <string name="settings_display_barcode_max_brightness_summary">Απαραίτητο για να δουλέψει σε κάποια σκάνερ</string>
-    <string name="cameraPermissionRequired">Χρειάζεται άδεια για πρόσβαση στην κάμερα γι\' αυτή την ενέργεια…</string>
+    <string name="cameraPermissionRequired">Δικαίωμα πρόσβασης στην κάμερα απαραίτητο γι\' αυτή την ενέργεια…</string>
     <string name="settings_allow_content_provider_read_title">Επιτρέπει σε άλλες εφαρμογές να έχουν πρόσβαση στα δεδομένα μου</string>
+    <string name="app_copyright_short">Πνευματικά δικαιώματα © Sylvia van Os και συνεργάτες</string>
+    <string name="height">Ύψος:</string>
+    <string name="switchToFrontImage">Μετάβαση στην μπροστινή εικόνα</string>
+    <string name="switchToBackImage">Μετάβαση στην πίσω εικόνα</string>
+    <string name="switchToBarcode">Μετάβαση σε barcode</string>
+    <string name="validFromSentence">Ισχύει από: <xliff:g>%s</xliff:g></string>
+    <string name="permissionReadCardsLabel">Διαβάστε τις κάρτες Catima</string>
+    <string name="openBackImageInGalleryApp">Ανοίξτε την πίσω εικόνα στην εφαρμογή γκαλερί</string>
+    <string name="permissionReadCardsDescription">Διάβασε τις Κάρτες σου Catima και όλες τους τις λεπτομέρειες, συμπεριλαμβανομένων των σημειώσεων και των εικόνων</string>
+    <string name="donate">Προσφέρω</string>
+    <string name="icon_header_click_text">Πατήστε παρατεταμένα για επεξεργασία του εικονιδίου</string>
+    <string name="openFrontImageInGalleryApp">Ανοίξτε την μπροστινή εικόνα στην εφαρμογή γκαλερί</string>
+    <string name="storageReadPermissionRequired">Δικαίωμα ανάγνωσης του χώρου αποθήκευσης απαραίτητο για αυτήν την ενέργεια…</string>
+    <string name="settings_follow_sensor_orientation">Πάντα σε περιστροφή (αγνοεί τις ρυθμίσεις του συστήματος)</string>
+    <string name="validFromDate">Ισχύει από</string>
+    <string name="anyDate">Οποιαδήποτε ημερομηνία</string>
+    <string name="chooseValidFromDate">Επιλέξτε έγκυρη ημερομηνία από</string>
+    <string name="setBarcodeHeight">Ρυθμίστε το ύψος του barcode</string>
+    <string name="show_name_below_image_thumbnail">Εμφάνιση ονόματος κάτω από το εικονίδιο</string>
+    <string name="app_name">Catima</string>
 </resources>

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

@@ -239,7 +239,7 @@
     <string name="starred">Estrellado</string>
     <string name="failedToRetrieveImageFile">No se pudo recuperar el archivo de imagen</string>
     <string name="barcodeLongPressMessage">Solo se pueden abrir imágenes en la aplicación de galería</string>
-    <string name="updateBalanceTitle">¿Cuánto has gastado\?</string>
+    <string name="updateBalanceTitle">¿Cuánto ha gastado o recibido?</string>
     <string name="currentBalanceSentence">Saldo actual: <xliff:g>%s</xliff:g></string>
     <string name="noCameraPermissionDirectToSystemSetting">Para escanear códigos de barras, Catima necesitará acceso a su cámara. Toque aquí para cambiar la configuración de sus permisos.</string>
     <string name="updateBalanceHint">Introduzca el importe</string>
@@ -291,4 +291,10 @@
     <string name="field_must_not_be_empty">Este campo no debe estar vacío</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Girar siempre (ignora la configuración del sistema)</string>
+    <string name="continue_">Continuar</string>
+    <string name="add_manually_warning_title">Se recomienda escanear</string>
+    <string name="add_manually_warning_message">En algunas tiendas, el valor del código de barras difiere del número escrito en la tarjeta. Por este motivo, es posible que la introducción manual del código de barras no siempre funcione. Se recomienda encarecidamente escanear el código de barras con la cámara. ¿Aún desea continuar?</string>
+    <string name="spend">Gastar</string>
+    <string name="receive">Recibió</string>
+    <string name="amountParsingFailed">Importe incorrecto</string>
 </resources>

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

@@ -228,7 +228,7 @@
         <item quantity="one">Näytä arkisto (<xliff:g>%1$d</xliff:g> kortti)</item>
         <item quantity="other">Näytä arkisto (<xliff:g>%1$d</xliff:g> korttia)</item>
     </plurals>
-    <string name="updateBalanceTitle">Kuinka paljon kulutit\?</string>
+    <string name="updateBalanceTitle">Kuinka paljon kulutit tai tienasit?</string>
     <string name="updateBalanceHint">Syötä summa</string>
     <string name="barcodeLongPressMessage">Vain kuvia on mahdollista avata galleriasovelluksessa</string>
     <string name="archive">Arkistoi</string>
@@ -283,4 +283,11 @@
     <string name="app_name">Catima</string>
     <string name="balanceParsingFailed">Virheellinen saldo</string>
     <string name="view_online">Näytä verkossa</string>
+    <string name="settings_follow_sensor_orientation">Kierrä aina (ohittaa järjestelmän asetukset)</string>
+    <string name="continue_">Jatka</string>
+    <string name="add_manually_warning_title">Skannausta suositellaan</string>
+    <string name="spend">Kuluta</string>
+    <string name="receive">Vastaanota</string>
+    <string name="amountParsingFailed">Virheellinen määrä</string>
+    <string name="add_manually_warning_message">Joidenkin kauppojen kohdalla viivakoodin arvo eroaa kortilla olevasta numerosta. Tämän takia viivakoodin syöttäminen käsin ei aina toimi. On vahvasti suositeltua skannata viivakoodi kameralla. Haluatko silti jatkaa?</string>
 </resources>

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

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

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

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

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

@@ -252,7 +252,7 @@
     <string name="shortcutSelectCard">Odaberi karticu</string>
     <string name="previousCard">Prethodna</string>
     <string name="nextCard">Sljedeća</string>
-    <string name="updateBalanceTitle">Koliko si potrošio/la\?</string>
+    <string name="updateBalanceTitle">Koliko si potrošio/la?</string>
     <string name="updateBalanceHint">Upiši iznos</string>
     <string name="about_title_fmt">Informaije o <xliff:g id="app_name">%s</xliff:g></string>
     <string name="failedToOpenUrl">Najprije instaliraj web preglednik</string>

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

@@ -226,7 +226,7 @@
     <string name="currentBalanceSentence">Jelenlegi egyenleg: <xliff:g>%s</xliff:g></string>
     <string name="updateBalanceHint">Adja meg az összeget</string>
     <string name="importCards">Kártyák importálása</string>
-    <string name="updateBalanceTitle">Mennyit költött\?</string>
+    <string name="updateBalanceTitle">Mennyit költött és kapott?</string>
     <string name="newBalanceSentence">Új egyenleg: <xliff:g>%s</xliff:g></string>
     <string name="cameraPermissionDeniedTitle">Nem sikerült hozzáférni a kamerához</string>
     <string name="failedToRetrieveImageFile">Nem sikerült lekérni a képfájlt</string>
@@ -284,4 +284,10 @@
     <string name="show_archived_cards">Archivált kártyák megjelenítése</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Mindig forgassa (figyelmen kívül hagyja a rendszerbeállításokat)</string>
+    <string name="amountParsingFailed">Hibás érték</string>
+    <string name="add_manually_warning_title">Szkennelés ajánlott</string>
+    <string name="add_manually_warning_message">Egyes boltoknál a kártyán levő számsor különbözik a vonalkódtól. Emiatt a manuális szám beírás nem minden esetben fog működni. Erősen ajánlott inkább a vonalkód szkennelése kamerával. Biztosan folytatja?</string>
+    <string name="continue_">Tovább</string>
+    <string name="spend">Költött</string>
+    <string name="receive">Megkapott</string>
 </resources>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="storeName">Nama</string>
     <string name="note">Keterangan</string>
     <string name="delete">Hapus</string>
@@ -231,7 +231,7 @@
     <string name="updateBalance">Perbarui saldo</string>
     <string name="updateBalanceHint">Masukkan jumlah</string>
     <string name="currentBalanceSentence">Saldo saat ini: <xliff:g>%s</xliff:g></string>
-    <string name="updateBalanceTitle">Berapa banyak yang telah kamu habiskan \?</string>
+    <string name="updateBalanceTitle">Berapa banyak yang telah kamu habiskan ?</string>
     <string name="noCameraPermissionDirectToSystemSetting">Untuk memindai barcode, Catima membutuhkan akses ke kamera mu. Tap disini untuk mengganti pengaturan perizinan mu.</string>
     <string name="cameraPermissionRequired">Berikan izin untuk mengakses kamera anda…</string>
     <string name="storageReadPermissionRequired">Berikan izin untuk membaca penyimpanan anda…</string>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="action_add">Bæta</string>
     <string name="noBarcode">Nei strikamerkið</string>
     <string name="action_search">Leita að</string>

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

@@ -241,7 +241,7 @@
     <string name="cameraPermissionDeniedTitle">È impossibile accedere alla fotocamera</string>
     <string name="noCameraPermissionDirectToSystemSetting">Per poter scansionare i codici a barre, Catima ha bisogno di accedere alla tua fotocamera. Premi qui per poter cambiare le impostazioni dei permessi.</string>
     <string name="updateBalance">Aggiorna bilancio</string>
-    <string name="updateBalanceTitle">Quanto hai speso\?</string>
+    <string name="updateBalanceTitle">Quanto hai speso o ricevuto?</string>
     <string name="updateBalanceHint">Inserisci l\'importo</string>
     <string name="currentBalanceSentence">Bilancio attuale: <xliff:g>%s</xliff:g></string>
     <string name="newBalanceSentence">Nuovo bilancio: <xliff:g>%s</xliff:g></string>
@@ -291,4 +291,10 @@
     <string name="field_must_not_be_empty">Il campo non deve essere vuoto</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Ruota sempre (ignora le impostazioni di sistema)</string>
+    <string name="add_manually_warning_title">Consigliata scansione</string>
+    <string name="continue_">Successivo</string>
+    <string name="add_manually_warning_message">In alcuni negozi, il valore del codice a barre differisce dal numero scritto sulla carta. Per questo motivo, l\'inserimento manuale del codice a barre potrebbe non funzionare sempre. Si consiglia di scansionare il codice a barre con la fotocamera. Vuoi continuare lo stesso?</string>
+    <string name="amountParsingFailed">Importo non valido</string>
+    <string name="spend">Spendi</string>
+    <string name="receive">Ricevi</string>
 </resources>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="wrongValueForBarcodeType">選択したバーコード形式ではこの番号は使用できません</string>
     <string name="unsupportedBarcodeType">このバーコード形式は表示できません。将来のアップデートにより対応するかもしれません。</string>
     <string name="setBarcodeId">バーコード番号を設定</string>
@@ -67,8 +67,6 @@
     <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>
@@ -152,15 +150,15 @@
     </plurals>
     <string name="barcodeImageDescriptionWithType">バーコード形式の画像 <xliff:g>%s</xliff:g></string>
     <string name="app_contributors">Made possible by: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="settings_brown_theme">Brown</string>
-    <string name="settings_grey_theme">Gray</string>
-    <string name="settings_green_theme">Green</string>
-    <string name="settings_sky_blue_theme">Sky Blue</string>
-    <string name="settings_blue_theme">Blue</string>
-    <string name="settings_violet_theme">Violet</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_pink_theme">Pink</string>
-    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_brown_theme">ブラウン/茶色</string>
+    <string name="settings_grey_theme">グレー/灰色</string>
+    <string name="settings_green_theme">グリーン/緑色</string>
+    <string name="settings_sky_blue_theme">スカイブルー/水色</string>
+    <string name="settings_blue_theme">ブルー/青色</string>
+    <string name="settings_violet_theme">バイオレット/菫色</string>
+    <string name="settings_magenta_theme">マゼンタ/赤紫色</string>
+    <string name="settings_pink_theme">ピンク/桃色</string>
+    <string name="settings_catima_theme">Catimaテーマ</string>
     <string name="settings_theme_color">テーマカラー</string>
     <string name="settings_system_locale">システムに従う</string>
     <string name="settings_locale">言語</string>
@@ -186,7 +184,7 @@
     <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>
@@ -198,11 +196,15 @@
     <string name="chooseValidFromDate">有効期限を選択</string>
     <string name="anyDate">無期限</string>
     <string name="app_name">Catima</string>
-    <string name="settings_card_orientation">バーコードの方向</string>
+    <string name="settings_card_orientation">バーコードの向き</string>
     <string name="settings_display_barcode_max_brightness_summary">仕事をするためにいくつかのスキャナーが必要</string>
-    <string name="settings_follow_system_orientation">フォローシステム</string>
+    <string name="settings_follow_system_orientation">システムに従う</string>
     <string name="storageReadPermissionRequired">このアクションのためにストレージの読み取り権限を許可…</string>
     <string name="cameraPermissionDeniedTitle">カメラへアクセスできません</string>
-    <string name="settings_follow_sensor_orientation">いつでも回転(システム設定を無視)</string>
+    <string name="settings_follow_sensor_orientation">自動回転 (システムを無視)</string>
     <string name="cameraPermissionRequired">このアクションのためにカメラへのアクセス権限の許可…</string>
+    <string name="settings_landscape_orientation">横</string>
+    <string name="settings_portrait_orientation">縦</string>
+    <string name="noGiftCardsGroup">いくつかのカードを作って、それらをこのグループにアサインします。</string>
+    <string name="noCameraPermissionDirectToSystemSetting">バーコードをスキャンするためには、Catimaはカメラへのアクセスを必要とします。ここをタップして権限設定の変更をお願いします。</string>
 </resources>

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

@@ -214,7 +214,7 @@
     <string name="backImageDescription">후면 사진</string>
     <string name="currentBalanceSentence">현재 잔액: <xliff:g>%s</xliff:g></string>
     <string name="importCards">카드 가져오기</string>
-    <string name="updateBalanceTitle">얼마를 썼습니까\?</string>
+    <string name="updateBalanceTitle">지출하거나 수령한 금액은 얼마입니까?</string>
     <string name="newBalanceSentence">새 잔액: <xliff:g>%s</xliff:g></string>
     <string name="settings_card_orientation">바코드 방향</string>
     <string name="settings_follow_system_orientation">기기 설정 따르기</string>
@@ -276,4 +276,6 @@
     <string name="enter_card_id">카드에 있는 ID 숫자 또는 텍스트 입력</string>
     <string name="addWithoutBarcode">바코드가 없는 카드 추가</string>
     <string name="app_name">Catima</string>
+    <string name="add_manually_warning_title">스캔을 권장합니다</string>
+    <string name="settings_follow_sensor_orientation">항상 회전 (시스템 설정 무시)</string>
 </resources>

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

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

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

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

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

@@ -236,7 +236,7 @@
     <string name="noCameraPermissionDirectToSystemSetting">Catima trenger kameratilgang for å skanne strekkoder. Trykk her for å endre tilgangsinnstillingene.</string>
     <string name="importCards">Importer kort</string>
     <string name="currentBalanceSentence">Nåværende saldo: <xliff:g>%s</xliff:g></string>
-    <string name="updateBalanceTitle">Hvor mye brukte du\?</string>
+    <string name="updateBalanceTitle">Hvor mye brukte du?</string>
     <string name="updateBalanceHint">Skriv inn beløp</string>
     <string name="newBalanceSentence">Ny saldo: <xliff:g>%s</xliff:g></string>
     <string name="updateBalance">Oppdater saldo</string>
@@ -283,4 +283,11 @@
     <string name="manually_enter_barcode_instructions">Skriv inn ID-nummer eller tekst fra kortet og trykk på strekkoden som ser ut til å ligne.</string>
     <string name="enter_card_id">Skriv inn ID-nummeret eller teksten på kortet</string>
     <string name="field_must_not_be_empty">Feltet må fylles ut</string>
+    <string name="add_manually_warning_title">Skanning anbefales</string>
+    <string name="continue_">Fortsett</string>
+    <string name="amountParsingFailed">Ugyldig beløp</string>
+    <string name="spend">Utgifter</string>
+    <string name="receive">Inntekt</string>
+    <string name="settings_follow_sensor_orientation">Alltid roter (ignorerer systeminnstilling)</string>
+    <string name="add_manually_warning_message">I noen butikker er strekkoden forskjellig fra nummeret på kortet. Som følge av dette kan det hende at å skrive inn strekkoden ikke virker. Det anbefales å skanne strekkoden med kameraet istedenfor. Fortsett?</string>
 </resources>

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

@@ -233,7 +233,7 @@
     <string name="failedToRetrieveImageFile">De afbeelding kan niet worden opgehaald</string>
     <string name="barcodeLongPressMessage">Alleen afbeeldingen kunnen worden geopend in de galerij-app</string>
     <string name="cameraPermissionDeniedTitle">Geen cameratoegang</string>
-    <string name="updateBalanceTitle">Hoeveel heb je uitgegeven\?</string>
+    <string name="updateBalanceTitle">Hoeveel heb je uitgegeven of ontvangen?</string>
     <string name="noCameraPermissionDirectToSystemSetting">Catima heeft toegang tot je camera nodig om barcodes te kunnen scannen. Druk hier om toegang te verlenen.</string>
     <string name="currentBalanceSentence">Huidig saldo: <xliff:g>%s</xliff:g></string>
     <string name="updateBalance">Saldo bijwerken</string>
@@ -284,4 +284,10 @@
     <string name="field_must_not_be_empty">Dit veld is vereist</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Altijd draaien (negeert systeeminstellingen)</string>
+    <string name="add_manually_warning_title">Scannen wordt aangeraden</string>
+    <string name="add_manually_warning_message">Bij sommige winkels wijkt de barcodewaarde af van het nummer op de kaart. Hierdoor werkt het handmatig invoeren van een barcode niet altijd. Het wordt sterk aangeraden om in plaats daarvan de barcode met je camera te scannen. Wilt u nog steeds doorgaan?</string>
+    <string name="continue_">Ga door</string>
+    <string name="spend">Geef uit</string>
+    <string name="receive">Ontvang</string>
+    <string name="amountParsingFailed">Ongeldig bedrag</string>
 </resources>

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

@@ -248,7 +248,7 @@
     </plurals>
     <string name="currentBalanceSentence">Bieżące saldo: <xliff:g>%s</xliff:g></string>
     <string name="noCameraPermissionDirectToSystemSetting">By zeskanować kody kreskowe, Catima musi mieć dostęp do twojej kamery. Dotknij tutaj by zmienić swoje ustawienia dostępu.</string>
-    <string name="updateBalanceTitle">Ile wydałeś\?</string>
+    <string name="updateBalanceTitle">Ile wydałeś?</string>
     <string name="updateBalanceHint">Wpisz sumę</string>
     <string name="updateBalance">Zaktualizuj balans</string>
     <string name="cameraPermissionDeniedTitle">Odmówiono dostępu do kamery</string>

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

@@ -245,7 +245,7 @@
     <string name="currentBalanceSentence">Saldo atual: <xliff:g>%s</xliff:g></string>
     <string name="newBalanceSentence">Novo saldo: <xliff:g>%s</xliff:g></string>
     <string name="updateBalance">Atualizar saldo</string>
-    <string name="updateBalanceTitle">Quanto gastou\?</string>
+    <string name="updateBalanceTitle">Quanto gastou ou recebeu?</string>
     <string name="updateBalanceHint">Introduza o valor</string>
     <string name="storageReadPermissionRequired">É necessária a permissão para ler o armazenamento para esta ação…</string>
     <string name="cameraPermissionRequired">É necessária a permissão para aceder à câmara para esta ação…</string>
@@ -290,4 +290,11 @@
     <string name="field_must_not_be_empty">O campo não pode estar vazio</string>
     <string name="show_archived_cards">Exibir cartões arquivados</string>
     <string name="app_name">Catima</string>
+    <string name="continue_">Continuar</string>
+    <string name="add_manually_warning_title">Recomenda-se a digitalização</string>
+    <string name="add_manually_warning_message">Em algumas lojas, o valor do código de barras é diferente do número escrito no cartão. Por este motivo, a introdução manual de um código de barras pode nem sempre funcionar. Recomenda-se vivamente que, em vez disso, digitalize o código de barras com a sua câmara. Ainda quer continuar?</string>
+    <string name="spend">Gastar</string>
+    <string name="receive">Receber</string>
+    <string name="amountParsingFailed">Montante inválida</string>
+    <string name="settings_follow_sensor_orientation">Rodar sempre (ignora as definições do sistema)</string>
 </resources>

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>
@@ -257,7 +257,7 @@
     <string name="show_archived_cards">Afișați cardurile arhivate</string>
     <string name="settings_card_orientation">Orientarea codului de bare</string>
     <string name="app_libraries">Biblioteci terță deschise: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="updateBalanceTitle">Cât de mult ați folosit?</string>
+    <string name="updateBalanceTitle">Cât de mult ați cheltuit sau primit?</string>
     <string name="settings_blue_theme">Albastru</string>
     <string name="app_resources">Resurse terță deschise: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_name">Catima</string>
@@ -290,4 +290,11 @@
     <string name="settings_keep_screen_on_summary">Dezactivează temporizatorul de ecran când vizualizați un card</string>
     <string name="rate_this_app">Acordați o recenzie acestei aplicații</string>
     <string name="credits">Contribuabili</string>
+    <string name="settings_follow_sensor_orientation">Rotește întotdeauna (ignora setările de sistem)</string>
+    <string name="continue_">Continua</string>
+    <string name="add_manually_warning_title">Se recomandă scanarea</string>
+    <string name="add_manually_warning_message">Pentru unele magazine, valoarea codului de bare diferă de numărul scris pe card. Din acest motiv, este posibil ca introducerea manuală a unui cod de bare să nu funcționeze întotdeauna. În schimb, este recomandat să scanați codul de bare cu camera dvs. Mai vrei să continui?</string>
+    <string name="spend">Cheltuie</string>
+    <string name="receive">Primește</string>
+    <string name="amountParsingFailed">Sumă nevalidă</string>
 </resources>

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

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

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

@@ -204,7 +204,7 @@
     <string name="unarchived">Karta vrátená z archívu</string>
     <string name="previousCard">Predošlá</string>
     <string name="nextCard">Nasledujúca</string>
-    <string name="updateBalanceTitle">Koľko ste minuli\?</string>
+    <string name="updateBalanceTitle">Koľko ste minuli alebo prjali?</string>
     <string name="updateBalanceHint">Zadajte čiastku</string>
     <string name="failedToOpenUrl">Najprv nainštalujte webový prehliadač</string>
     <string name="welcome">Vitajte v Catima</string>
@@ -291,4 +291,10 @@
     <string name="show_archived_cards">Zobraziť archivované karty</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Vždy otáčať (ignoruje nastavenie systému)</string>
+    <string name="continue_">Pokračovať</string>
+    <string name="spend">Utratené</string>
+    <string name="receive">Prijaté</string>
+    <string name="amountParsingFailed">Neplatná hodnota</string>
+    <string name="add_manually_warning_title">Skenovanie je odporúčané</string>
+    <string name="add_manually_warning_message">V niektorých obchodoch nie je číslo na cenovke totožné s čiarovým kódom, preto je lepšie zoskenovať čiarový kód. Chcete napriek tomu pokračovať?</string>
 </resources>

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

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

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

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

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

@@ -235,7 +235,7 @@
     <string name="noCameraPermissionDirectToSystemSetting">Barkodları taramak için Catima\'nın kameranıza erişmesi gerekecektir. İzin ayarlarınızı değiştirmek için buraya dokunun.</string>
     <string name="currentBalanceSentence">Geçerli bakiye: <xliff:g>%s</xliff:g></string>
     <string name="updateBalanceHint">Miktarı girin</string>
-    <string name="updateBalanceTitle">Ne kadar harcadınız\?</string>
+    <string name="updateBalanceTitle">Ne kadar harcadınız veya aldınız?</string>
     <string name="newBalanceSentence">Yeni bakiye: <xliff:g>%s</xliff:g></string>
     <string name="cameraPermissionDeniedTitle">Kameraya erişilemedi</string>
     <string name="updateBalance">Bakiyeyi güncelle</string>
@@ -284,4 +284,10 @@
     <string name="field_must_not_be_empty">Alan boş olamaz</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">Her zaman döndür (sistem ayarlarını yok sayar)</string>
+    <string name="continue_">Devam et</string>
+    <string name="add_manually_warning_title">Tarama yapılması tavsiye edilir</string>
+    <string name="add_manually_warning_message">Bazı mağazalarda barkod değeri kartta yazan sayıdan farklıdır. Bu nedenle, bir barkodu elle girmek her zaman işe yaramayabilir. Bunun yerine barkodu kameranızla taramanız şiddetle tavsiye edilir. Yine de devam etmek istiyor musunuz?</string>
+    <string name="spend">Harca</string>
+    <string name="receive">Al</string>
+    <string name="amountParsingFailed">Geçersiz miktar</string>
 </resources>

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

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

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

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

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

@@ -227,7 +227,7 @@
         <item quantity="other">查看存档（<xliff:g>%1$d</xliff:g> 张卡片）</item>
     </plurals>
     <string name="updateBalance">更新余额</string>
-    <string name="updateBalanceTitle">你花了多少钱？</string>
+    <string name="updateBalanceTitle">你支出或者收到了多少钱？</string>
     <string name="currentBalanceSentence">当前余额：<xliff:g>%s</xliff:g></string>
     <string name="failedToRetrieveImageFile">无法检索图像文件</string>
     <string name="newBalanceSentence">新余额：<xliff:g>%s</xliff:g></string>
@@ -277,4 +277,10 @@
     <string name="field_must_not_be_empty">字段不能为空</string>
     <string name="app_name">Catima</string>
     <string name="settings_follow_sensor_orientation">始终旋转（忽略系统设置）</string>
+    <string name="add_manually_warning_title">建议扫描</string>
+    <string name="continue_">继续</string>
+    <string name="add_manually_warning_message">某些商店卡片的二维码值和刻在卡上的数字并不一样。由于这个原因，手动输入二维码可能并不总是有用。这种情况下，强烈建议你用相机扫描二维码。你仍要继续吗？</string>
+    <string name="receive">接收</string>
+    <string name="amountParsingFailed">无效金额</string>
+    <string name="spend">支出</string>
 </resources>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="action_search">搜尋</string>
     <string name="action_add">新增</string>
     <string name="noGiftCards">點選 + 按鈕以新增卡片，或從 ⋮ 選單中匯入。</string>
@@ -275,4 +275,5 @@
     <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>

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,9 @@
 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;
@@ -19,10 +23,6 @@ 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;

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

@@ -1,5 +1,9 @@
 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;
@@ -8,6 +12,9 @@ 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;
@@ -20,13 +27,6 @@ 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;

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

@@ -1,11 +1,19 @@
 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;
@@ -27,9 +35,12 @@ 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;
@@ -59,21 +70,6 @@ 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";

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

@@ -1,5 +1,10 @@
 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;
@@ -10,6 +15,8 @@ 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;
 
@@ -18,20 +25,12 @@ 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;

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.3.1" apply false
     id("com.github.spotbugs") version "5.1.4" apply false
 }
 

docs/RELEASE_STEPS.md

@@ -5,7 +5,9 @@
 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`
-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`
-8. Create a new release on GitHub and attach the `app-release.apk` and `SHA256SUMS` files
+5. Create a commit for the new release: `git add CHANGELOG.md app/build.gradle.kts && git commit -m "Release Catima <VERSION>"`
+6. Build a new .apk: `KEYSTORE=/path/to/keystore KEYSTORE_ALIAS=catima ./build.sh`
+7. Upload the APK to Google Play Open Testing
+8. Push the version update commit: `git push`
+9. Create a new release on GitHub and attach the `app-release.apk` and `SHA256SUMS` files
+10. After the release has been approved on Google Play Production, update the metadata there: `bundle exec fastlane supply --version_code <VERSION_CODE>`

fastlane/metadata/android/cs-CZ/changelogs/133.txt

@@ -0,0 +1,4 @@
+- Cílový systém Android 14
+- Otevření ikony karty v galerii na dotykovém displeji
+- Vylepšení designu karty Fotografie ve zobrazení úprav
+- Aktualizována obrazovka výdajů s podporou příjmů

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ž 20 jazyků.
+- Lokalizované ručně prováděné překlady pro více než 40 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.

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 die 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 bereits eine 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))

fastlane/metadata/android/de-DE/changelogs/111.txt

@@ -1,7 +1,7 @@
-- Unterstützung der arabischen Sprache
+- Arabisch wird unterstützt
 - Anzeige der archivierten Kartenanzahl in der Gruppenübersicht
-- Behebung von Fehlern bei der Guthabenanalyse (Karten in arabischer oder anderen nicht-westlichen Zahlen wurden nicht gespeichert)
-- Benutzerdefiniertes Thema wird nicht korrekt auf den Hauptbildschirm angewendet
-- Verbesserte Anzeige der ausgewählten Karten
-- Absturz beim Verlassen der Kartenansicht in RTL-Layouts für Karten mit Ablaufdatum oder Guthaben behoben
-- Rückwärtspfeil in der Kartenansicht zeigt in RTL-Layouts nicht mehr in die falsche Richtung
+- Guthabenanalyse - Fehler beseitigt (Arabisch bzw. Sprachen mit nicht-westlichen Zahlen wurden nicht gespeichert)
+- Benutzerdefiniertes Thema wird nun korrekt auf dem Hauptbildschirm gezeigt
+- Verbesserte Anzeige ausgewählter Karten
+- Kein Absturz beim Verlassen der Kartenansicht bei Karten mit Ablaufdatum/Guthaben
+- Rückwärtspfeil in der Kartenansicht zeigt nicht mehr die falsche Richtung (RTL-Layout)

fastlane/metadata/android/de-DE/changelogs/133.txt

@@ -0,0 +1,4 @@
+- Angepasst für Android 14
+- „Touch“ auf Karten-Symbol öffnet dieses in Galerie
+- Design der Registerkarte „Fotos“ in der Bearbeitungsansicht verbessert
+- Bildschirm für „Guthaben“ aktualisiert, um auch „Einnahmen“ anzeigen zu können

fastlane/metadata/android/de-DE/changelogs/30.txt

@@ -1,4 +1,4 @@
-- Einstellung zur Steuerung der Bildschirmhelligkeit bei der Bacrode-Anzeige (Pull #259 (https://github.com/brarcher/loyalty-card-locker/pull/259))
-- Griechische Übersetzungen hinzugefügt (Pull #252 (https://github.com/brarcher/loyalty-card-locker/pull/252))
-- Slowenischen Übersetzungen hinzugefügt (Pull #260 (https://github.com/brarcher/loyalty-card-locker/pull/260))
+- Steuerung der Bildschirmhelligkeit bei Anzeige des Barcode eingefügt (Pull #259 (https://github.com/brarcher/loyalty-card-locker/pull/259))
+- Griechisch eingefügt (Pull #252 (https://github.com/brarcher/loyalty-card-locker/pull/252))
+- Slowenisch eingefügt (Pull #260 (https://github.com/brarcher/loyalty-card-locker/pull/260))
 - Übersetzungen aktualisiert (pull #260 (https://github.com/brarcher/loyalty-card-locker/pull/260), pull #254 (https://github.com/brarcher/loyalty-card-locker/pull/254))

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 20 Sprachen.
+- Lokalisierte, menschliche Übersetzungen für mehr als 40 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.

fastlane/metadata/android/en-US/changelogs/133.txt

@@ -0,0 +1,4 @@
+- Target Android 14
+- Open card icon in gallery on touch
+- Improve design of Photos tab in edit view
+- Update spending screen to also support receiving

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 20+ languages.
+- Localized hand-made translations for 40+ 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.

fastlane/metadata/android/es-ES/changelogs/11.txt

@@ -1,5 +1,5 @@
-- 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))
+- Al editar un ID de tarjeta, rellenar previamente el ID existente para empezar. (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 insuficiente. (pull #103 (https://github.com/brarcher/loyalty-card-locker/pull/103))
+- Al editar una tarjeta, cambiar el 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))
+- Cambiar la combinación de colores 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 lanza en el primer lanzamiento de la aplicación. (pull #108 (https://github.com/brarcher/loyalty-card-locker/pull/108))

fastlane/metadata/android/es-ES/full_description.txt

@@ -1,22 +1,22 @@
-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>
+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>
 
-Olvídese de su billetera o manténgala ultraligera para objetos de valor.
+Olvídese de la cartera, o manténgala ultraligera para los objetos de valor.
 
-Con esta herramienta esencial de transporte diario (EDC), puede reemplazar el plástico inútil con dinero en efectivo.
+Con esta herramienta esencial para llevar a diario (EDC) puede sustituir el plástico inútil por dinero en efectivo.
 
-- 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.
+- 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.
 - Tema oscuro y opciones de accesibilidad para usuarios con problemas de visión.
-- 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>.
+- 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.
 
-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.
+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.

fastlane/metadata/android/hi-IN/changelogs/11.txt

@@ -0,0 +1,5 @@
+- कार्ड आईडी संपादित करते समय, शुरू करने के लिए मौजूदा आईडी को पहले से भरें।
+- मेमोरी उपयोग को कम करने और मेमोरी त्रुटियों को दूर करने के लिए जेनरेट किए गए बारकोड की चौड़ाई सीमित करें।
+- कार्ड संपादित करते समय, यदि कार्ड आईडी पहले से मौजूद है तो "कार्ड दर्ज करें" बटन को बदलकर "कार्ड संपादित करें" कहें।
+- रंग योजना को नरम और ऐप आइकन के साथ संगत करने के लिए बदलें, और कार्ड को साफ-सुथरा देखने के लिए लेआउट बदलें।
+- एक परिचय विज़ार्ड जोड़ें जो ऐप के पहले लॉन्च पर लॉन्च होता है।

fastlane/metadata/android/hi-IN/changelogs/115.txt

@@ -1,4 +1,4 @@
--लम्बे दबाव पर गैलरी में इमेज को खोलें
--संवादों में मटेरियल स्टाइल लागू करें
--Catima पर इमेज साझा करके कार्ड बनाने का समर्थन 
--कार्ड स्क्रीन पर त्वरित खर्च बटन जोड़ें
+- लंबे समय तक दबाकर रखने पर गैलरी में छवि खोलें
+- संवाद में सामग्री शैली लागू करें
+- कैटिमा में एक छवि साझा करके ग्रीटिंग कार्ड का समर्थन करें
+- कार्ड स्क्रीन में त्वरित खर्च बटन जोड़ें

fastlane/metadata/android/hi-IN/changelogs/116.txt

@@ -0,0 +1,2 @@
+- अनुमति न देने वाले त्वरित व्यय संवाद को ठीक करें, विभाजक
+- फ़ाइल प्रबंधक से छवि लोड करने का समर्थन करें

fastlane/metadata/android/hi-IN/changelogs/124.txt

@@ -0,0 +1 @@
+- कार्ड अवलोकन में वास्तव में कौन सा विवरण देखना है, इसका चयन करने में सहायता

fastlane/metadata/android/hi-IN/changelogs/127.txt

@@ -0,0 +1,4 @@
+- बारकोड प्रतिपादन में सुधार
+- बाहरी ऐप्स के साथ बुनियादी अंतरसंचालनीयता (एंड्रॉइड 6.0+)
+- पुनर्गठित सेटिंग्स स्क्रीन
+- कुछ ब्राउज़रों से आयात को ठीक करें जो शेयर यूआरएल में पिछला / जोड़ते हैं

fastlane/metadata/android/hi-IN/changelogs/129.txt

@@ -0,0 +1,3 @@
+- बेहतर कैटिमा आयातक (आयात करते समय गुम हुए कार्डों को ठीक करता है)
+- वैध दिनांक/समाप्ति तिथि निर्धारित करते समय स्क्रीन को घुमाते समय क्रैश को ठीक करें
+- यूआई में मामूली बदलाव

fastlane/metadata/android/hi-IN/changelogs/13.txt

@@ -0,0 +1,2 @@
+- v0.11 में बदलाव से बारकोड ड्राइंग की मेमोरी का उपयोग कम हो गया, लेकिन बारकोड आयाम प्रभावित हुआ। मेमोरी उपयोग को कम करते हुए बारकोड आयामों को बनाए रखने के लिए इसे अब बदल दिया गया है
+- अद्यतन जर्मन और फ़्रेंच अनुवाद