Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker into fix/deprecatedProgressDialog

Replace ProgressDialog with notification
2025-12-24 23:57:53 -05:00 · 2021-12-18 14:48:13 +01:00 · 2021-11-28 21:48:48 +01:00
79 changed files with 420 additions and 762 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,8 @@
 # Changelog

-## v2.13.0 - 97 (2022-01-03)
-
- Fixed pressing the save button multiple times creating multiple entries
- Lower card header size when hiding details to fit even more cards
- Restructure edit screen
- Improve star icon contrast in main view
-
-## v2.12.0 - 96 (2021-12-23)
+## Unreleased - 96

 - Add CODE 93 support
- Various minor bugfixes and improvements

 ## v2.11.2 - 95 (2021-12-04)

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
        applicationId "me.hackerchick.catima"
        minSdkVersion 21
        targetSdkVersion 31
-        versionCode 97
-        versionName "2.13.0"
+        versionCode 95
+        versionName "2.11.2"

        vectorDrawables.useSupportLibrary true
        multiDexEnabled true
--- a/app/src/main/java/protect/card_locker/ImportExportActivity.java
+++ b/app/src/main/java/protect/card_locker/ImportExportActivity.java
@@ -1,7 +1,10 @@
 package protect.card_locker;

 import android.Manifest;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -22,6 +25,7 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
+import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;

 import java.io.FileInputStream;
@@ -54,6 +58,12 @@ public class ImportExportActivity extends CatimaAppCompatActivity {

    final private TaskHandler mTasks = new TaskHandler();

+    private NotificationManager mNotifyManager;
+    private NotificationCompat.Builder mBuilder;
+
+    private static final int NOTIFICATION_IMPORT = 1;
+    private static final int NOTIFICATION_EXPORT = 2;
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -94,7 +104,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
            try {
                OutputStream writer = getContentResolver().openOutputStream(uri);
                Log.e(TAG, "Starting file export with: " + result.toString());
-                startExport(writer, uri, exportPassword.toCharArray(), true);
+                startExport(writer, uri, exportPassword != null ? exportPassword.toCharArray() : null, true);
            } catch (IOException e) {
                Log.e(TAG, "Failed to export file: " + result.toString(), e);
                onExportComplete(ImportExportResult.GenericFailure, uri);
@@ -256,22 +266,59 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
        builder.show();
    }

+    private void startProgressNotification(boolean importing) {
+        mNotifyManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        mBuilder = new NotificationCompat.Builder(this, NotificationType.getImportExportChannel(this));
+        mBuilder.setContentTitle(getString(importing ? R.string.importing : R.string.exporting))
+                .setContentText(null)
+                .setSmallIcon(R.drawable.ic_import_export_white_24dp)
+                .setColor(getThemeColor())
+                .setProgress(0, 0, true);
+        mNotifyManager.notify(importing ? NOTIFICATION_IMPORT : NOTIFICATION_EXPORT, mBuilder.build());
+    }
+
+    private void endProgressNotification(boolean importing, ImportExportResult result, PendingIntent sendIntent) {
+        String notificationTitle;
+        String notificationMessage;
+
+        if (result.equals(ImportExportResult.Success)) {
+            notificationTitle = getString(importing ? R.string.importSuccessfulTitle : R.string.exportSuccessfulTitle);
+            notificationMessage = getString(importing ? R.string.importSuccessful : R.string.exportSuccessful);
+        } else {
+            int reason = R.string.unknown_failure;
+            if (result.equals(ImportExportResult.BadPassword)) {
+                reason = R.string.incorrect_password;
+            }
+
+            notificationTitle = getString(importing ? R.string.importFailedTitle : R.string.exportFailedTitle);
+            notificationMessage = String.format(getString(importing ? R.string.importFailed : R.string.exportFailed), getString(reason));
+        }
+
+        mBuilder.setContentTitle(notificationTitle)
+                .setContentText(notificationMessage)
+                .setProgress(0,0, false);
+
+        if (sendIntent != null) {
+            mBuilder.addAction(R.drawable.ic_share, getString(R.string.sendLabel), sendIntent);
+        }
+
+        mNotifyManager.notify(importing ? NOTIFICATION_IMPORT : NOTIFICATION_EXPORT, mBuilder.build());
+    }
+
    private void startImport(final InputStream target, final Uri targetUri, final DataFormat dataFormat, final char[] password, final boolean closeWhenDone) {
        mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false);
-        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener() {
-            @Override
-            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat) {
-                onImportComplete(result, targetUri, dataFormat);
-                if (closeWhenDone) {
-                    try {
-                        target.close();
-                    } catch (IOException ioException) {
-                        ioException.printStackTrace();
-                    }
+        ImportExportTask.TaskCompleteListener listener = (result, dataFormat1) -> {
+            onImportComplete(result, targetUri, dataFormat1);
+            if (closeWhenDone) {
+                try {
+                    target.close();
+                } catch (IOException ioException) {
+                    ioException.printStackTrace();
                }
            }
        };

+        startProgressNotification(true);
        importExporter = new ImportExportTask(ImportExportActivity.this,
                dataFormat, target, password, listener);
        mTasks.executeTask(TaskHandler.TYPE.IMPORT, importExporter);
@@ -279,20 +326,18 @@ public class ImportExportActivity extends CatimaAppCompatActivity {

    private void startExport(final OutputStream target, final Uri targetUri, char[] password, final boolean closeWhenDone) {
        mTasks.flushTaskList(TaskHandler.TYPE.EXPORT, true, false, false);
-        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener() {
-            @Override
-            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat) {
-                onExportComplete(result, targetUri);
-                if (closeWhenDone) {
-                    try {
-                        target.close();
-                    } catch (IOException ioException) {
-                        ioException.printStackTrace();
-                    }
+        ImportExportTask.TaskCompleteListener listener = (result, dataFormat) -> {
+            onExportComplete(result, targetUri);
+            if (closeWhenDone) {
+                try {
+                    target.close();
+                } catch (IOException ioException) {
+                    ioException.printStackTrace();
                }
            }
        };

+        startProgressNotification(false);
        importExporter = new ImportExportTask(ImportExportActivity.this,
                DataFormat.Catima, target, password, listener);
        mTasks.executeTask(TaskHandler.TYPE.EXPORT, importExporter);
@@ -358,72 +403,27 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
    }

    private void onImportComplete(ImportExportResult result, Uri path, DataFormat dataFormat) {
+        endProgressNotification(true, result, null);
+
        if (result == ImportExportResult.BadPassword) {
            retryWithPassword(dataFormat, path);
-            return;
        }
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-
-        int messageId;
-
-        if (result == ImportExportResult.Success) {
-            builder.setTitle(R.string.importSuccessfulTitle);
-            messageId = R.string.importSuccessful;
-        } else {
-            builder.setTitle(R.string.importFailedTitle);
-            messageId = R.string.importFailed;
-        }
-
-        final String message = getResources().getString(messageId);
-
-        builder.setMessage(message);
-        builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.dismiss();
-            }
-        });
-
-        builder.create().show();
    }

    private void onExportComplete(ImportExportResult result, final Uri path) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-
-        int messageId;
+        PendingIntent pendingIntent = null;

        if (result == ImportExportResult.Success) {
-            builder.setTitle(R.string.exportSuccessfulTitle);
-            messageId = R.string.exportSuccessful;
-        } else {
-            builder.setTitle(R.string.exportFailedTitle);
-            messageId = R.string.exportFailed;
+            Intent sendIntent = new Intent(Intent.ACTION_SEND);
+            sendIntent.putExtra(Intent.EXTRA_STREAM, path);
+            sendIntent.setType("text/csv");
+
+            // set flag to give temporary permission to external app to use the FileProvider
+            sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+            pendingIntent = PendingIntent.getActivity(this, NOTIFICATION_EXPORT, sendIntent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
        }

-        final String message = getResources().getString(messageId);
-
-        builder.setMessage(message);
-        builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());
-
-        if (result == ImportExportResult.Success) {
-            final CharSequence sendLabel = ImportExportActivity.this.getResources().getText(R.string.sendLabel);
-
-            builder.setPositiveButton(sendLabel, (dialog, which) -> {
-                Intent sendIntent = new Intent(Intent.ACTION_SEND);
-                sendIntent.putExtra(Intent.EXTRA_STREAM, path);
-                sendIntent.setType("text/csv");
-
-                // set flag to give temporary permission to external app to use the FileProvider
-                sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-
-                ImportExportActivity.this.startActivity(Intent.createChooser(sendIntent,
-                        sendLabel));
-
-                dialog.dismiss();
-            });
-        }
-
-        builder.create().show();
+        endProgressNotification(false, result, pendingIntent);
    }
 }
--- a/app/src/main/java/protect/card_locker/ImportExportTask.java
+++ b/app/src/main/java/protect/card_locker/ImportExportTask.java
@@ -1,7 +1,7 @@
 package protect.card_locker;

 import android.app.Activity;
-import android.app.ProgressDialog;
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.database.sqlite.SQLiteDatabase;
@@ -13,6 +13,7 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;

+import androidx.core.app.NotificationCompat;
 import protect.card_locker.async.CompatCallable;
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;
@@ -22,15 +23,13 @@ import protect.card_locker.importexport.MultiFormatImporter;
 public class ImportExportTask implements CompatCallable<ImportExportResult> {
    private static final String TAG = "Catima";

-    private Activity activity;
-    private boolean doImport;
-    private DataFormat format;
+    private final Activity activity;
+    private final boolean doImport;
+    private final DataFormat format;
    private OutputStream outputStream;
    private InputStream inputStream;
-    private char[] password;
-    private TaskCompleteListener listener;
-
-    private ProgressDialog progress;
+    private final char[] password;
+    private final TaskCompleteListener listener;

    /**
     * Constructor which will setup a task for exporting to the given file
@@ -61,11 +60,11 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
    }

    private ImportExportResult performImport(Context context, InputStream stream, SQLiteDatabase database, char[] password) {
-        ImportExportResult importResult = MultiFormatImporter.importData(context, database, stream, format, password);
+        ImportExportResult result = MultiFormatImporter.importData(context, database, stream, format, password);

-        Log.i(TAG, "Import result: " + importResult.name());
+        Log.i(TAG, "Import result: " + result.name());

-        return importResult;
+        return result;
    }

    private ImportExportResult performExport(Context context, OutputStream stream, SQLiteDatabase database, char[] password) {
@@ -84,20 +83,6 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
        return result;
    }

-    public void onPreExecute() {
-        progress = new ProgressDialog(activity);
-        progress.setTitle(doImport ? R.string.importing : R.string.exporting);
-
-        progress.setOnDismissListener(new DialogInterface.OnDismissListener() {
-            @Override
-            public void onDismiss(DialogInterface dialog) {
-                ImportExportTask.this.stop();
-            }
-        });
-
-        progress.show();
-    }
-
    protected ImportExportResult doInBackground(Void... nothing) {
        final SQLiteDatabase database = new DBHelper(activity).getWritableDatabase();
        ImportExportResult result;
@@ -114,15 +99,15 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
    }

    public void onPostExecute(Object castResult) {
-        listener.onTaskComplete((ImportExportResult) castResult, format);
+        ImportExportResult result = (ImportExportResult) castResult;
+
+        listener.onTaskComplete(result, format);

-        progress.dismiss();
        Log.i(TAG, (doImport ? "Import" : "Export") + " Complete");
    }

-    protected void onCancelled() {
-        progress.dismiss();
-        Log.i(TAG, (doImport ? "Import" : "Export") + " Cancelled");
+    @Override
+    public void onPreExecute() {
    }

    protected void stop() {
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -101,7 +101,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            inputHolder.setExpiryField(null);
        }

-        setHeaderHeight(inputHolder, mShowDetails);
        Bitmap cardIcon = Utils.retrieveCardImage(mContext, loyaltyCard.id, ImageLocationType.icon);
        if (cardIcon != null) {
            inputHolder.mCardIcon.setImageBitmap(cardIcon);
@@ -122,19 +121,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
        inputHolder.mRow.requestLayout();
    }

-    private void setHeaderHeight(LoyaltyCardListItemViewHolder inputHolder, boolean expanded) {
-        int iconHeight;
-        if (expanded) {
-            iconHeight = ViewGroup.LayoutParams.MATCH_PARENT;
-        } else {
-            iconHeight = (int) mContext.getResources().getDimension(R.dimen.cardThumbnailSize);
-        }
-
-        inputHolder.mIconLayout.getLayoutParams().height = expanded ? 0 : iconHeight;
-        inputHolder.mCardIcon.getLayoutParams().height = iconHeight;
-        inputHolder.mTickIcon.getLayoutParams().height = iconHeight;
-    }
-
    private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition) {
        inputHolder.mRow.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));

@@ -214,7 +200,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso

        public TextView mStoreField, mNoteField, mBalanceField, mExpiryField;
        public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon;
-        public MaterialCardView mRow, mIconLayout;
+        public MaterialCardView mRow;
        public ConstraintLayout mStar;
        public View mDivider;

@@ -229,7 +215,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            mBalanceField = inputView.findViewById(R.id.balance);
            mExpiryField = inputView.findViewById(R.id.expiry);

-            mIconLayout = inputView.findViewById(R.id.icon_layout);
            mCardIcon = inputView.findViewById(R.id.thumbnail);
            mStar = inputView.findViewById(R.id.star);
            mStarBackground = inputView.findViewById(R.id.star_background);
@@ -317,10 +302,10 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
                dark = !mDarkModeEnabled;
            }
            if (dark) {
-                mStarBorder.setImageResource(R.drawable.ic_unstarred_white);
+                mStarBorder.setImageResource(R.drawable.ic_unstarred_black);
                mStarBackground.setImageResource(R.drawable.ic_starred_black);
            } else {
-                mStarBorder.setImageResource(R.drawable.ic_unstarred_black);
+                mStarBorder.setImageResource(R.drawable.ic_unstarred_white);
                mStarBackground.setImageResource(R.drawable.ic_starred_white);
            }
            if (enable) {
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -153,7 +153,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    AlertDialog confirmExitDialog = null;

    boolean validBalance = true;
-    Runnable barcodeImageGenerationFinishedCallback;
+    Runnable warnOnInvalidBarcodeType;

    HashMap<String, Currency> currencies = new HashMap<>();

@@ -208,10 +208,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    private void updateTempState(LoyaltyCardField fieldName, Object value) {
        tempLoyaltyCard = updateTempState(tempLoyaltyCard, fieldName, value);

-        if (initDone && (fieldName == LoyaltyCardField.cardId || fieldName == LoyaltyCardField.barcodeId || fieldName == LoyaltyCardField.barcodeType)) {
-            generateBarcode();
-        }
-
        hasChanged = true;
    }

@@ -227,7 +223,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {

        importLoyaltyCardUri = intent.getData();

-        Log.d(TAG, "Edit activity: id=" + loyaltyCardId
+        Log.d(TAG, "View activity: id=" + loyaltyCardId
                + ", updateLoyaltyCard=" + updateLoyaltyCard);
    }

@@ -330,9 +326,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
        cardImageFront.setBackgroundColor(getThemeColor());
        cardImageBack.setBackgroundColor(getThemeColor());

-        barcodeImageGenerationFinishedCallback = () -> {
+        warnOnInvalidBarcodeType = () -> {
            if (!(boolean) barcodeImage.getTag()) {
-                barcodeImageLayout.setVisibility(View.GONE);
                Toast.makeText(LoyaltyCardEditActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
            }
        };
@@ -529,6 +524,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                } else {
                    updateTempState(LoyaltyCardField.barcodeId, s.toString());
                }
+
+                generateOrHideBarcode();
            }

            @Override
@@ -559,6 +556,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                        } catch (IllegalArgumentException e) {
                        }
                    }
+
+                    generateOrHideBarcode();
                }
            }

@@ -890,7 +889,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            hasChanged = hadChanges;
        }

-        generateBarcode();
+        generateOrHideBarcode();

        enterButton.setOnClickListener(new EditCardIdAndBarcode());
        barcodeImage.setOnClickListener(new EditCardIdAndBarcode());
@@ -1244,11 +1243,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    }

    private void doSave() {
-        if (isFinishing()) {
-            // If we are done saving, ignore any queued up save button presses
-            return;
-        }
-
        if (tempStoredOldBarcodeValue != null) {
            askBarcodeChange(this::doSave);
            return;
@@ -1404,22 +1398,27 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
        );
    }

-    private void generateBarcode() {
-        if (tempLoyaltyCard == null) {
-            return;
-        }
+    private void showBarcode() {
+        barcodeImageLayout.setVisibility(View.VISIBLE);
+    }

-        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
+    private void hideBarcode() {
+        barcodeImageLayout.setVisibility(View.GONE);
+    }

+    private void generateOrHideBarcode() {
        String cardIdString = tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : tempLoyaltyCard.cardId;
        CatimaBarcode barcodeFormat = tempLoyaltyCard.barcodeType;

-        if (cardIdString == null || barcodeFormat == null) {
-            barcodeImageLayout.setVisibility(View.GONE);
-            return;
+        if (barcodeFormat == null || cardIdString.isEmpty() || !barcodeFormat.isSupported()) {
+            hideBarcode();
+        } else {
+            generateBarcode(cardIdString, barcodeFormat);
        }
+    }

-        barcodeImageLayout.setVisibility(View.VISIBLE);
+    private void generateBarcode(String cardIdString, CatimaBarcode barcodeFormat) {
+        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);

        if (barcodeImage.getHeight() == 0) {
            Log.d(TAG, "ImageView size is not known known at start, waiting for load");
@@ -1432,15 +1431,17 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                            barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);

                            Log.d(TAG, "ImageView size now known");
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType);
                            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                        }
                    });
        } else {
            Log.d(TAG, "ImageView size known known, creating barcode");
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType);
            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
        }
+
+        showBarcode();
    }

    private void generateIcon(String store) {
@@ -1470,24 +1471,30 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
        }

        View cardPart = findViewById(R.id.cardPart);
-        View optionsPart = findViewById(R.id.optionsPart);
+        View barcodePart = findViewById(R.id.barcodePart);
        View picturesPart = findViewById(R.id.picturesPart);

        if (getString(R.string.card).equals(part)) {
            cardPart.setVisibility(View.VISIBLE);
-            optionsPart.setVisibility(View.GONE);
+            barcodePart.setVisibility(View.GONE);
+            picturesPart.setVisibility(View.GONE);
+
+            // Explicitly hide barcode (fixes blurriness on redraw)
+            hideBarcode();
+        } else if (getString(R.string.barcode).equals(part)) {
+            cardPart.setVisibility(View.GONE);
+            barcodePart.setVisibility(View.VISIBLE);
            picturesPart.setVisibility(View.GONE);

            // Redraw barcode due to size change (Visibility.GONE sets it to 0)
-            generateBarcode();
-        } else if (getString(R.string.options).equals(part)) {
-            cardPart.setVisibility(View.GONE);
-            optionsPart.setVisibility(View.VISIBLE);
-            picturesPart.setVisibility(View.GONE);
+            generateOrHideBarcode();
        } else if (getString(R.string.photos).equals(part)) {
            cardPart.setVisibility(View.GONE);
-            optionsPart.setVisibility(View.GONE);
+            barcodePart.setVisibility(View.GONE);
            picturesPart.setVisibility(View.VISIBLE);
+
+            // Explicitly hide barcode (fixes blurriness on redraw)
+            hideBarcode();
        } else {
            throw new UnsupportedOperationException();
        }
--- a/app/src/main/java/protect/card_locker/NotificationType.java
+++ b/app/src/main/java/protect/card_locker/NotificationType.java
@@ -0,0 +1,29 @@
+package protect.card_locker;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Build;
+
+public class NotificationType {
+    private final static String NOTIFICATION_IMPORT_EXPORT = "NOTIFICATION_IMPORT_EXPORT";
+
+    public static String getImportExportChannel(Context context) {
+        createNotificationChannel(context, NOTIFICATION_IMPORT_EXPORT, context.getString(R.string.importExport), context.getString(R.string.importExportDescription), NotificationManager.IMPORTANCE_HIGH);
+
+        return NOTIFICATION_IMPORT_EXPORT;
+    }
+
+    private static void createNotificationChannel(Context context, String channelId, CharSequence name, String description, int importance) {
+        // Create the NotificationType, but only on API 26+ because
+        // the NotificationType class is new and not in the support library
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            NotificationChannel channel = new NotificationChannel(channelId, name, importance);
+            channel.setDescription(description);
+            // Register the channel with the system; you can't change the importance
+            // or other notification behaviors after this
+            NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+            notificationManager.createNotificationChannel(channel);
+        }
+    }
+}
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -39,7 +39,7 @@
            <com.google.android.material.tabs.TabItem
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                android:text="@string/options"/>
+                android:text="@string/barcode"/>
            <com.google.android.material.tabs.TabItem
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
@@ -128,94 +128,6 @@
                    </com.google.android.material.textfield.TextInputLayout>
                </LinearLayout>

-                <!-- Barcode ID -->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/inputPadding"
-                    android:paddingTop="@dimen/inputPadding"
-                    android:orientation="horizontal">
-
-                    <!-- Barcode ID -->
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/barcodeIdView"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1.0"
-                        android:hint="@string/barcodeId"
-                        android:labelFor="@+id/barcodeIdView">
-
-                        <AutoCompleteTextView
-                            android:id="@+id/barcodeIdField"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="none"/>
-
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
-
-                <!-- Barcode type -->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/inputPadding"
-                    android:paddingTop="@dimen/inputPadding"
-                    android:orientation="horizontal">
-
-                    <!-- Barcode type -->
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/barcodeTypeView"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1.0"
-                        android:hint="@string/barcodeType"
-                        android:labelFor="@+id/barcodeTypeField">
-
-                        <AutoCompleteTextView
-                            android:id="@+id/barcodeTypeField"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="none"/>
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
-
-                <!-- Barcode -->
-                <LinearLayout android:orientation="horizontal"
-                    android:padding="10.0dip"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/barcodeLayout">
-                    <ImageView
-                        android:layout_width="0dp"
-                        android:layout_height="@dimen/barcode_disp_height"
-                        android:layout_gravity="center_horizontal"
-                        android:padding="10.0dp"
-                        android:background="#ffffff"
-                        android:id="@+id/barcode"
-                        android:layout_weight="1.0"/>
-                </LinearLayout>
-
-                <!-- Buttons -->
-                <LinearLayout android:orientation="horizontal"
-                    android:padding="10.0dip"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/barcodeCaptureLayout">
-                    <Button android:id="@+id/enterButton"
-                        android:layout_margin="@dimen/inputMargin"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:text="@string/editBarcode"
-                        android:textColor="#FFFFFF"
-                        android:layout_weight="1.0"/>
-                </LinearLayout>
-            </TableLayout>
-            <TableLayout
-                android:id="@+id/optionsPart"
-                android:visibility="gone">
-
                <!-- Note -->
                <LinearLayout
                    android:layout_width="match_parent"
@@ -328,6 +240,99 @@
                    </com.google.android.material.textfield.TextInputLayout>
                </LinearLayout>
            </TableLayout>
+            <TableLayout
+                android:id="@+id/barcodePart"
+                android:visibility="gone">
+
+                <!-- Barcode ID -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="@dimen/inputPadding"
+                    android:paddingTop="@dimen/inputPadding"
+                    android:orientation="horizontal">
+
+                    <!-- Barcode ID -->
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/barcodeIdView"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.0"
+                        android:hint="@string/barcodeId"
+                        android:labelFor="@+id/barcodeIdView">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/barcodeIdField"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="none"/>
+
+                    </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
+
+                <!-- Barcode type -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="@dimen/inputPadding"
+                    android:paddingTop="@dimen/inputPadding"
+                    android:orientation="horizontal">
+
+                    <!-- Barcode type -->
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/barcodeTypeView"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.0"
+                        android:hint="@string/barcodeType"
+                        android:labelFor="@+id/barcodeTypeField">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/barcodeTypeField"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="none"/>
+                    </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
+
+                <!-- Barcode -->
+                <View
+                    android:layout_height="@dimen/inputBorderThickness"
+                    android:layout_width="match_parent" />
+
+                <LinearLayout android:orientation="horizontal"
+                              android:padding="10.0dip"
+                              android:layout_width="fill_parent"
+                              android:layout_height="wrap_content"
+                              android:visibility="gone"
+                              android:id="@+id/barcodeLayout">
+                    <ImageView
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/barcode_disp_height"
+                        android:layout_gravity="center_horizontal"
+                        android:padding="10.0dp"
+                        android:background="#ffffff"
+                        android:id="@+id/barcode"
+                        android:layout_weight="1.0"/>
+                </LinearLayout>
+
+                <!-- Buttons -->
+                <LinearLayout android:orientation="horizontal"
+                    android:padding="10.0dip"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/barcodeCaptureLayout">
+                    <Button android:id="@+id/enterButton"
+                        android:layout_margin="@dimen/inputMargin"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/editBarcode"
+                        android:textColor="#FFFFFF"
+                        android:layout_weight="1.0"/>
+                </LinearLayout>
+            </TableLayout>

            <TableLayout
                android:id="@+id/picturesPart"
--- a/app/src/main/res/layout/loyalty_card_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_layout.xml
@@ -77,7 +77,7 @@
                    android:visibility="visible"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_unstarred_black"
+                    app:srcCompat="@drawable/ic_unstarred_white"
                    tools:ignore="ImageContrastCheck" />

            </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/raw/contributors.txt
+++ b/app/src/main/res/raw/contributors.txt
@@ -10,8 +10,8 @@ Oğuz Ersen
 IllusiveMan196
 Petr Novák
 Taco
-Joel A
 Gediminas Murauskas
+Joel A
 StoyanDimitrov
 Nyatsuki
 Altonss
@@ -20,14 +20,14 @@ arno-github
 Ankit Tiwari
 Sergio Paredes
 laralem
-Michael Moroni
 arshbeerSingh
 huuhaa
 Miha Frangež
-sr093906
+Michael Moroni
 Olivia (Zoe)
 betsythefc
 waffshappen
+sr093906
 K. Herbert
 Quentin PAGÈS
 String E. Fighter
@@ -41,7 +41,6 @@ D. Domig
 Diego
 Jane Kong
 Lukas Grassauer
-Maciej Błędkowski
 Marnick L'Eau
 Michalis
 Rosdyana Kusuma
@@ -60,8 +59,9 @@ Kasina Dheeraj
 Flav
 Franciszek Stefan
 Izzy
-krkk
+Karol Kosek
 bittin
+Maciej Błędkowski
 Marco
 Mattia
 Michael Gangolf
@@ -77,7 +77,6 @@ Still Hsu
 Subhashish Anand
 Tymofii Lytvynenko
 Tjipke van der Heide
-Yevgeny M
 avikkundu
 opsik
 psa-jforestier
@@ -85,4 +84,3 @@ Robin
 sergio
 Marcus
 techwebpd
-rr-vesp
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -106,9 +106,9 @@
    <string name="importOptionApplicationButton">Избиране чрез приложение</string>
    <string name="importing">Внасяне…</string>
    <string name="exporting">Изнасяне…</string>
-    <string name="exportFailed">Картите не могат да бъдат изнесени</string>
+    <string name="exportFailed">Картите не могат да бъдат изнесени: <xliff:g>%s</xliff:g></string>
    <string name="exportFailedTitle">Грешка при изнасяне</string>
-    <string name="importFailed">Картите не могат да бъдат внесени</string>
+    <string name="importFailed">Картите не могат да бъдат внесени: <xliff:g>%s</xliff:g></string>
    <string name="importFailedTitle">Грешка при внасяне</string>
    <string name="exportSuccessfulTitle">Резултат от изнасяне</string>
    <string name="importSuccessfulTitle">Резултат от внасяне</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -23,10 +23,10 @@
    <string name="importExportHelp">Zálohování karet vám umožní přesunout je do jiného zařízení.</string>
    <string name="importSuccessfulTitle">Importováno</string>
    <string name="importFailedTitle">Import selhal</string>
-    <string name="importFailed">Nelze importovat karty</string>
+    <string name="importFailed">Nelze importovat karty: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Exportovat</string>
    <string name="exportFailedTitle">Export selhal</string>
-    <string name="exportFailed">Nelze exportovat karty</string>
+    <string name="exportFailed">Nelze exportovat karty: <xliff:g>%s</xliff:g></string>
    <string name="importing">Importuji…</string>
    <string name="exporting">Exportuji…</string>
    <string name="noExternalStoragePermissionError">Udělit povolení externího úložiště pro import nebo export karet jako první</string>
@@ -222,8 +222,4 @@
    <string name="group_updated">Skupina aktualizována</string>
    <string name="editGroup">Úprava skupiny: <xliff:g>%s</xliff:g></string>
    <string name="noGiftCardsGroup">Zatím nemáte žádné věrnostní karty. Jakmile nějaké přidáte, můžete je přiřadit do skupiny zde.</string>
-    <string name="shortcutSelectCard">Vybrat kartu</string>
-    <string name="action_show_details">Zobrazit detaily</string>
-    <string name="action_hide_details">Skrýt detaily</string>
-    <string name="translate_platform">na Weblate</string>
 </resources>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -41,10 +41,10 @@
    <string name="importExportHelp">Hvis du sikkerhedskopierer dine kort, kan du flytte dem til en anden enhed.</string>
    <string name="importSuccessfulTitle">Importeret</string>
    <string name="importFailedTitle">Import mislykkedes</string>
-    <string name="importFailed">Kunne ikke importere kort</string>
+    <string name="importFailed">Kunne ikke importere kort: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Eksporteret</string>
    <string name="exportFailedTitle">Eksport mislykkedes</string>
-    <string name="exportFailed">Kunne ikke eksportere kort</string>
+    <string name="exportFailed">Kunne ikke eksportere kort: <xliff:g>%s</xliff:g></string>
    <string name="importing">Importere…</string>
    <string name="exporting">Eksportere…</string>
    <string name="settings_dark_theme">Mørk</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -32,10 +32,10 @@
    <string name="importExportHelp">Wenn du deine Daten sicherst, kannst du sie auf ein anderes Gerät übertragen.</string>
    <string name="importSuccessfulTitle">Importiert</string>
    <string name="importFailedTitle">Import fehlgeschlagen</string>
-    <string name="importFailed">Import konnte nicht durchgeführt werden</string>
+    <string name="importFailed">Karten konnten nicht importiert werden: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Exportiert</string>
    <string name="exportFailedTitle">Export fehlgeschlagen</string>
-    <string name="exportFailed">Export konnte nicht durchgeführt werden</string>
+    <string name="exportFailed">Karten konnten nicht exportiert werden: <xliff:g>%s</xliff:g></string>
    <string name="importing">Importiere…</string>
    <string name="exporting">Exportiere…</string>
    <string name="noExternalStoragePermissionError">Berechtigung für den externen Speicher zum Importieren oder Exportieren von Daten erteilen</string>
@@ -222,4 +222,4 @@
    <string name="action_hide_details">Details ausblenden</string>
    <string name="translate_platform">auf Weblate</string>
    <string name="shortcutSelectCard">Wählen Sie eine Karte</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -28,10 +28,10 @@
    <string name="importExportHelp">Τα εφεδρικά δεδομένα σας δίνουν την δυνατότητα να μεταφέρετε τις κάρτες σας σε μία άλλη συσκευή.</string>
    <string name="importSuccessfulTitle">Εισαγωγή επιτυχής</string>
    <string name="importFailedTitle">Εισαγωγή ανεπιτυχής</string>
-    <string name="importFailed">Δεν εισήχθει</string>
+    <string name="importFailed">Δεν εισήχθει: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Εξαγωγή επιτυχής</string>
    <string name="exportFailedTitle">Εξαγωγή ανεπιτυχής</string>
-    <string name="exportFailed">Δεν εξήχθη</string>
+    <string name="exportFailed">Δεν εξήχθη: <xliff:g>%s</xliff:g></string>
    <string name="importing">Γίνεται εισαγωγή του…</string>
    <string name="exporting">Γίνεται εξαγωγή του…</string>
    <string name="noExternalStoragePermissionError">Δεν είναι δυνατή η εισαγωγή ή εξαγωγή καρτών χωρίς την άδεια πρόσβασης στον εξωτερικό χώρο αποθήκευσης</string>
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -65,8 +65,8 @@
    <string name="importOptionFilesystemExplanation">Elektu specifa dosiero de la dosiersistemo.</string>
    <string name="exportOptionExplanation">La datumoj estos skribita al loko de via elekto.</string>
    <string name="noExternalStoragePermissionError">Grant ekstera stokado permeso de importado aŭ eksportado kartoj unua</string>
-    <string name="exportFailed">Ne povis eksporti kartoj</string>
-    <string name="importFailed">Ne povis importi kartoj</string>
+    <string name="exportFailed">Ne povis eksporti kartoj: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Ne povis importi kartoj: <xliff:g>%s</xliff:g></string>
    <string name="importExportHelp">Subtenanta supre vian kartoj permesas vin movi ilin al alia aparato.</string>
    <string name="failedParsingImportUriError">Ne eblis analizi la importado URI</string>
    <string name="noCardExistsError">Ne eblis trovi karto</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -28,10 +28,10 @@
    <string name="importExportHelp">El respaldo le permite transferir sus tarjetas a otro dispositivo.</string>
    <string name="importSuccessfulTitle">Importado</string>
    <string name="importFailedTitle">Falló la importación</string>
-    <string name="importFailed">No se han podido importar tarjetas</string>
+    <string name="importFailed">No se han podido importar tarjetas: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Exportado</string>
    <string name="exportFailedTitle">Falló la exportación</string>
-    <string name="exportFailed">No se han podido exportar las tarjetas</string>
+    <string name="exportFailed">No se han podido exportar las tarjetas: <xliff:g>%s</xliff:g></string>
    <string name="importing">Importando…</string>
    <string name="exporting">Exportando…</string>
    <string name="noExternalStoragePermissionError">Otorgar permiso de almacenamiento para importar o exportar tarjetas</string>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -104,10 +104,10 @@
    <string name="exportOptionExplanation">Tiedot kirjoitetaan valitsemaasi sijaintiin.</string>
    <string name="exporting">Viedään…</string>
    <string name="importing">Tuodaan…</string>
-    <string name="exportFailed">Kortteja ei voitu viedä</string>
+    <string name="exportFailed">Kortteja ei voitu viedä: <xliff:g>%s</xliff:g></string>
    <string name="exportFailedTitle">Vienti epäonnistui</string>
    <string name="exportSuccessfulTitle">Vienti valmis</string>
-    <string name="importFailed">Kortteja ei voitu tuoda</string>
+    <string name="importFailed">Kortteja ei voitu tuoda: <xliff:g>%s</xliff:g></string>
    <string name="importFailedTitle">Tuonti epäonnistui</string>
    <string name="importSuccessfulTitle">Tuonti valmis</string>
    <string name="importExportHelp">Varmuuskopioimalla korttisi, voit siirtää ne toiseen laitteeseen.</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -27,11 +27,11 @@
    <string name="exportName">Exporter</string>
    <string name="importExportHelp">La sauvegarde de vos données permet de les déplacer sur un autre appareil.</string>
    <string name="importSuccessfulTitle">Importé</string>
-    <string name="importFailedTitle">Échec de l’import</string>
-    <string name="importFailed">Impossible d’effectuer l’importation</string>
+    <string name="importFailedTitle">Échec de l\'import</string>
+    <string name="importFailed">Impossible d\'importer les cartes: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Exporté</string>
-    <string name="exportFailedTitle">Échec de l’export</string>
-    <string name="exportFailed">Impossible d’effectuer l’exportation</string>
+    <string name="exportFailedTitle">Échec de l\'export</string>
+    <string name="exportFailed">Impossible d\'exporter les cartes: <xliff:g>%s</xliff:g></string>
    <string name="importing">Import …</string>
    <string name="exporting">Export …</string>
    <string name="noExternalStoragePermissionError">Accorder au stockage externe l’autorisation d’importer ou d’exporter des données</string>
@@ -222,4 +222,4 @@
    <string name="action_hide_details">Masquer les détails</string>
    <string name="translate_platform">sur Weblate</string>
    <string name="shortcutSelectCard">Sélectionnez une carte</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-he-rIL/strings.xml
+++ b/app/src/main/res/values-he-rIL/strings.xml
@@ -1,56 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
    <string name="action_add">הוספה</string>
+
    <string name="cardId">מזהה כרטיס</string>
    <string name="cancel">ביטול</string>
    <string name="save">שמור</string>
-    <string name="ok">אישור</string>
-    <string name="action_search">חיפוש</string>
-    <string name="noGiftCards">לחץ על לחצן ה + להוספת כרטיס, או ייבא מספר כרטיסים באמצעות התפריט ⋮.</string>
-    <string name="lockScreen">סיבוב</string>
-    <string name="share">שיתוף</string>
-    <string name="copy_to_clipboard">העתקת מזהה ללוח</string>
-    <string name="addCardTitle">הוספת כרטיס</string>
-    <string name="noCardIdError">אין מזהה כרטיס</string>
-    <string name="star">הוספה למועדפים</string>
-    <string name="unstar">הסרה ממועדפים</string>
-    <string name="note">הערות</string>
-    <string name="barcodeType">סוג ברקוד</string>
-    <string name="noBarcode">אין ברקוד</string>
-    <string name="edit">עריכה</string>
-    <plurals name="selectedCardCount">
-        <item quantity="one">אחד</item>
-        <item quantity="two">שניים</item>
-        <item quantity="many">מעט</item>
-        <item quantity="other">אחר</item>
-    </plurals>
-    <string name="exportFailed">לא ניתן לייצא</string>
-    <string name="noGiftCardsGroup">צור מספר כרטיסים, ואז שייך אותם לקבוצה פה.</string>
-    <string name="failedParsingImportUriError">נתיב לא נמצא</string>
-    <string name="noMatchingGiftCards">אין תוצאות. נסה חיפוש אחר.</string>
-    <string name="storeName">שם חנות</string>
-    <string name="barcodeNoBarcode">אין ברקוד</string>
-    <string name="delete">מחיקה</string>
-    <string name="confirm">אישור</string>
-    <string name="deleteTitle">מחק כרטיס</string>
-    <string name="deleteConfirmation">האם למחוק כרטיס זה\?</string>
-    <string name="sendLabel">שליחה…</string>
-    <string name="editCardTitle">עריכת כרטיס</string>
-    <string name="scanCardBarcode">סריקת ברקוד</string>
-    <string name="cardShortcut">קיצור דרך</string>
-    <string name="noCardsMessage">תחילה הוסף כרטיס</string>
-    <string name="card_ids_copied">מזהי כרטיס הועתקו</string>
-    <string name="barcodeImageDescriptionWithType"></string>
-    <string name="noStoreError">לא הוכנס שם חנות</string>
-    <string name="noCardExistsError">כרטיס לא נמצא</string>
-    <string name="importExport">ייבוא/ייצוא</string>
-    <string name="exportName">ייצוא</string>
-    <string name="importExportHelp">גיבוי המידע שלך מאפשר העברתו למכשיר אחר.</string>
-    <string name="importSuccessfulTitle">הייבוא הצליח</string>
-    <string name="importFailedTitle">הייבוא נכשל</string>
-    <string name="importFailed">לא ניתן לייבא</string>
-    <string name="exportSuccessfulTitle">הייצוא הצליח</string>
-    <string name="exportFailedTitle">הייצוא נכשל</string>
-    <string name="importing">מייבא…</string>
-    <string name="exporting">ייצוא…</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="unstar">Ukloni iz favorita</string>
    <string name="action_search">Pretraživanje</string>
    <string name="save">Spremi</string>
@@ -38,7 +38,7 @@
    <string name="importExportHelp">Sigurnosno kopiranje kartica omogućuje vam da ih premjestite na drugi uređaj.</string>
    <string name="importSuccessfulTitle">Uvezeno</string>
    <string name="importFailedTitle">Nije moguće uvesti</string>
-    <string name="importFailed">Nije moguće uvesti karte</string>
+    <string name="importFailed">Nije moguće uvesti karte: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Izvezeno</string>
    <string name="about">Oh</string>
    <string name="importOptionApplicationButton">Koristite drugu aplikaciju</string>
@@ -51,7 +51,7 @@
    <string name="importOptionApplicationTitle">Koristite drugu aplikaciju</string>
    <string name="settings">Postavke</string>
    <string name="settings_dark_theme">Tamno</string>
-    <string name="exportFailed">Nije moguće izvesti karte</string>
+    <string name="exportFailed">Nije moguće izvesti karte: <xliff:g>%s</xliff:g></string>
    <string name="importing">Uvoz…</string>
    <string name="importOptionFilesystemTitle">Uvoz iz datotečnog sustava</string>
    <string name="importOptionFilesystemButton">Iz datotečnog sustava</string>
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -90,10 +90,10 @@
    <string name="exportName">Ekspor</string>
    <string name="importSuccessfulTitle">Sudah diimpor</string>
    <string name="importFailedTitle">Impor gagal</string>
-    <string name="importFailed">Tidak dapat mengimpor kartu</string>
+    <string name="importFailed">Tidak dapat mengimpor kartu: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Sudah diekspor</string>
    <string name="exportFailedTitle">Ekspor gagal</string>
-    <string name="exportFailed">Tidak dapat mengekspor kartu</string>
+    <string name="exportFailed">Tidak dapat mengekspor kartu: <xliff:g>%s</xliff:g></string>
    <string name="importing">Mengimpor…</string>
    <string name="exporting">Mengekspor…</string>
    <string name="noExternalStoragePermissionError">Berikan izin penyimpanan eksternal untuk mengimpor atau mengekspor kartu terlebih dahulu</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -33,10 +33,10 @@
    <string name="importExportHelp">Il backup dei dati permette di spostarli su un altro dispositivo.</string>
    <string name="importSuccessfulTitle">Importato</string>
    <string name="importFailedTitle">Importazione fallita</string>
-    <string name="importFailed">Impossibile eseguire l\'importazione</string>
+    <string name="importFailed">Impossibile importare le carte: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Esportato</string>
    <string name="exportFailedTitle">Esportazione fallita</string>
-    <string name="exportFailed">Impossibile eseguire l\'esportazione</string>
+    <string name="exportFailed">Impossibile esportare le carte: <xliff:g>%s</xliff:g></string>
    <string name="importing">Importazione in corso…</string>
    <string name="exporting">Esportazione in corso…</string>
    <string name="noExternalStoragePermissionError">Concedi il permesso di archiviazione esterna per importare o esportare dati</string>
@@ -107,7 +107,7 @@
    <string name="expiryStateSentenceExpired">Scaduta: <xliff:g>%s</xliff:g></string>
    <string name="expiryStateSentence">Scadenza: <xliff:g>%s</xliff:g></string>
    <string name="settings_keep_screen_on">Mantieni lo schermo attivo</string>
-    <string name="app_loyalty_card_keychain">Carte fedeltà</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
    <string name="chooseImportType">Importa i dati da</string>
    <string name="settings_disable_lockscreen_while_viewing_card">Impedisci il blocco dello schermo</string>
    <string name="accept">Accetta</string>
@@ -221,6 +221,4 @@
    <string name="action_show_details">Mostra i dettagli</string>
    <string name="action_hide_details">Nascondi i dettagli</string>
    <string name="translate_platform">su Weblate</string>
-    <string name="shortcutSelectCard">Seleziona una tessera</string>
-    <string name="options">Opzioni</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -92,7 +92,7 @@
    <string name="noExternalStoragePermissionError">データをインポート/エクスポートするために外部ストレージへのアクセスを許可してください</string>
    <string name="exporting">エクスポート中…</string>
    <string name="importing">インポート中…</string>
-    <string name="exportFailed">カードをエクスポートできませんでした</string>
+    <string name="exportFailed">カードをエクスポートできませんでした: <xliff:g>%s</xliff:g></string>
    <string name="exportFailedTitle">エクスポートに失敗しました</string>
    <string name="exportSuccessfulTitle">エクスポートしました</string>
    <string name="sameAsCardId">カード番号に合わせる</string>
@@ -100,7 +100,7 @@
    <string name="importVoucherVaultMessage">Voucher Vaultでエクスポートした <i>vouchervault.json</i>ファイルを選択してください。
 \nファイルがない場合、Voucher Vaultでファイルをエクスポートしてください。</string>
    <string name="importVoucherVault">Voucher Vaultからインポート</string>
-    <string name="importFailed">カードをインポートできません</string>
+    <string name="importFailed">カードをインポートできません: <xliff:g>%s</xliff:g></string>
    <string name="importFailedTitle">インポートに失敗しました</string>
    <string name="importSuccessfulTitle">インポートしました</string>
    <string name="importExportHelp">データをバックアップすると、他のデバイスにカードを移すことができます。</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -55,11 +55,11 @@
    <string name="importOptionApplicationTitle">외부 앱 사용</string>
    <string name="importOptionFilesystemExplanation">파일 시스템에서 파일을 선택합니다.</string>
    <string name="importOptionFilesystemTitle">파일 시스템에서 가져오기</string>
-    <string name="exportFailed">카드를 내보낼 수 없음</string>
+    <string name="exportFailed">카드를 내보낼 수 없음: <xliff:g>%s</xliff:g></string>
    <string name="importOptionApplicationExplanation">다른 파일 관리자 또는 앱을 사용하여 파일을 엽니다.</string>
    <string name="exportFailedTitle">내보내기 실패</string>
    <string name="exportSuccessfulTitle">내보내기 완료</string>
-    <string name="importFailed">카드를 가져올 수 없음</string>
+    <string name="importFailed">카드를 가져올 수 없음: <xliff:g>%s</xliff:g></string>
    <string name="importFailedTitle">가져오기 실패</string>
    <string name="importSuccessfulTitle">가져오기 완료</string>
    <string name="noCardIdError">카드 ID를 입력하지 않음</string>
--- a/app/src/main/res/values-lb/strings.xml
+++ b/app/src/main/res/values-lb/strings.xml
@@ -22,7 +22,7 @@
    <string name="cardShortcut">Kaart Bréck</string>
    <string name="exportSuccessfulTitle">Exportéieren</string>
    <string name="exportFailedTitle">Export fehlgeschlagen</string>
-    <string name="exportFailed">Kaarten konnten net exportéiert ginn</string>
+    <string name="exportFailed">Kaarten konnten net exportéiert ginn: <xliff:g>%s</xliff:g></string>
    <string name="importing">Importéieren…</string>
    <string name="importOptionFilesystemTitle">Import aus dem Dateisystem</string>
    <string name="importOptionFilesystemExplanation">Wielt eng bestëmmte Datei aus dem Dateisystem.</string>
@@ -59,7 +59,7 @@
    <string name="unsupportedBarcodeType">Dee barcode-Typ kann net ugewise ginn. Et kann zu enger spéiderer Versioun vun der App ënnerstëtzt ginn.</string>
    <string name="yes">Jo</string>
    <string name="importFailedTitle">Import fehlgeschlagen</string>
-    <string name="importFailed">Kaarten konnten net anere sproochen ginn</string>
+    <string name="importFailed">Kaarten konnten net anere sproochen ginn: <xliff:g>%s</xliff:g></string>
    <string name="exporting">Ausführende…</string>
    <string name="exportOptionExplanation">D \' Donnéeë ginn op eng Plaz vun Hirer Wal geschriwwen.</string>
    <string name="importOptionApplicationExplanation">Benotzen Se eng beliebige App oder Hire bevorzugten Dateimanager, fir eng Datei ze opmaachen.</string>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -19,8 +19,8 @@
    <string name="noCardIdError">Neįvestas kortelės ID</string>
    <string name="importExport">Importuoti/Exportuoti</string>
    <string name="exportName">Exportuoti</string>
-    <string name="importFailed">Nepavyko importuoti kortelių</string>
-    <string name="exportFailed">Nepavyko eksportuoti kortelių</string>
+    <string name="importFailed">Nepavyko importuoti kortelių: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Nepavyko eksportuoti kortelių: <xliff:g>%s</xliff:g></string>
    <string name="importing">Importuoja…</string>
    <string name="exporting">Eksportuoja…</string>
    <string name="noExternalStoragePermissionError">Pirmiausia suteikite išorinės saugyklos leidimą, kad galėtumėte importuoti arba eksportuoti korteles</string>
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="action_search">Meklēšana</string>
    <string name="action_add">Pievienot</string>
    <string name="noGiftCards">Noklikšķiniet uz pogas + plus, lai pievienotu karti, vai vispirms importējiet dažus no ⋮ izvēlnes.</string>
@@ -44,10 +44,10 @@
    <string name="importExportHelp">Jūsu Karšu dublēšana ļauj pārvietot tās uz citu ierīci.</string>
    <string name="importSuccessfulTitle">Importēts</string>
    <string name="importFailedTitle">Neizdevās importēt</string>
-    <string name="importFailed">Nevarēja importēt kartes</string>
+    <string name="importFailed">Nevarēja importēt kartes: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Eksports</string>
    <string name="exportFailedTitle">Eksports neizdevās</string>
-    <string name="exportFailed">Nevarēja eksportēt kartes</string>
+    <string name="exportFailed">Nevarēja eksportēt kartes: <xliff:g>%s</xliff:g></string>
    <string name="importing">Imports…</string>
    <string name="exporting">Eksports…</string>
    <string name="noExternalStoragePermissionError">Piešķiriet ārējai atmiņai atļauju vispirms importēt vai eksportēt kartes</string>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
    <string name="action_add">Legg til</string>
-    <string name="noGiftCards">Klikk på «+» (pluss)-knappen for å legge til eller importer kort fra «⋮»-menyen</string>
+    <string name="noGiftCards">Klikk på «+» (pluss)-knappen for å legge til eller importer kort fra «⋮»-menyen først.</string>
    <string name="storeName">Navn</string>
    <string name="note">Merknad</string>
    <string name="cardId">Kort-ID</string>
@@ -18,24 +18,24 @@
    <string name="sendLabel">Send…</string>
    <string name="editCardTitle">Rediger kundekort</string>
    <string name="addCardTitle">Legg til kundekort</string>
-    <string name="scanCardBarcode">Skann strekkoden</string>
+    <string name="scanCardBarcode">Skann kortets strekkode</string>
    <string name="cardShortcut">Kort-snarvei</string>
    <string name="noCardsMessage">Legg til et kort først</string>
    <string name="noStoreError">Navn ikke angitt</string>
-    <string name="noCardIdError">Ingen ID innskrevet</string>
-    <string name="noCardExistsError">Fant ikke det kortet</string>
+    <string name="noCardIdError">Ingen kort-ID innskrevet</string>
+    <string name="noCardExistsError">Kunne ikke finne kort</string>
    <string name="importExport">Importer/eksporter</string>
    <string name="exportName">Eksporter</string>
-    <string name="importExportHelp">Sikkerhetskopiering av data lar deg flytte dem til en annen enhet.</string>
+    <string name="importExportHelp">Sikkerhetskopiering av kort lar deg flytte dem til en annen enhet.</string>
    <string name="importSuccessfulTitle">Importert</string>
    <string name="importFailedTitle">Kunne ikke importere</string>
-    <string name="importFailed">Kunne ikke utføre import</string>
+    <string name="importFailed">Klarte ikke å importere kort: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Eksportert</string>
    <string name="exportFailedTitle">Kunne ikke eksportere</string>
-    <string name="exportFailed">Kunne ikke utføre eksport</string>
+    <string name="exportFailed">Kunne ikke eksportere kort: <xliff:g>%s</xliff:g></string>
    <string name="importing">Importerer…</string>
    <string name="exporting">Exporterer…</string>
-    <string name="noExternalStoragePermissionError">Innvilg lagringstilgang til eksternlager for å importere eller eksportere data</string>
+    <string name="noExternalStoragePermissionError">Innvilg lagringstilgang til eksternlager for å importere eller eksportere kort først</string>
    <string name="exportOptionExplanation">Data skrives dit du ønsker det.</string>
    <string name="importOptionFilesystemTitle">Importer fra filsystem</string>
    <string name="importOptionFilesystemExplanation">Velg spesifikk fil fra filsystemet.</string>
@@ -49,15 +49,15 @@
    <string name="debug_version_fmt">Versjon: <xliff:g id="version">%s</xliff:g></string>
    <string name="app_revision_fmt">Utgivelsesinfo: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="selectBarcodeTitle">Velg strekkode</string>
-    <string name="enterBarcodeInstructions">Skriv inn kortets ID, og enten velg strekkodetypen nedenfor, eller «Det er ingen strekkode».</string>
-    <string name="copy_to_clipboard_toast">ID kopiert til utklippstavle</string>
-    <string name="thumbnailDescription">Miniatyrbilde</string>
+    <string name="enterBarcodeInstructions">Skriv inn kortets ID, og enten velg dens strekkode nedenfor, eller «Dette kortet har ingen strekkode».</string>
+    <string name="copy_to_clipboard_toast">Kort-ID kopiert til utklippstavle</string>
+    <string name="thumbnailDescription">Miniatyrbilde for kort</string>
    <string name="settings">Innstillinger</string>
    <string name="settings_category_title_ui">Brukergrensesnitt</string>
    <string name="settings_display_barcode_max_brightness">Lysere strekkodevisning</string>
    <string name="settings_lock_barcode_orientation">Lås strekkodesideretning</string>
-    <string name="exportSuccessful">Data eksportert</string>
-    <string name="importSuccessful">Data importert</string>
+    <string name="exportSuccessful">Kortdata eksportert</string>
+    <string name="importSuccessful">Kortdata importert</string>
    <string name="intent_import_card_from_url_share_text">Jeg ønsker å dele et kort med deg</string>
    <string name="settings_dark_theme">Mørk</string>
    <string name="settings_light_theme">Lys</string>
@@ -67,8 +67,8 @@
 \nopphavsrett 2016–2020 Branden Archer</string>
    <string name="failedParsingImportUriError">Kunne ikke tolke importerings-URI</string>
    <string name="share">Del</string>
-    <string name="barcodeNoBarcode">Det er ingen strekkode</string>
-    <string name="noMatchingGiftCards">Resultatløst. Prøv å endre søket.</string>
+    <string name="barcodeNoBarcode">Dette kortet har ingen strekkode</string>
+    <string name="noMatchingGiftCards">Fant ikke noe. Prøv å endre søket.</string>
    <string name="action_search">Søk</string>
    <string name="starImage">Favorittstjerne</string>
    <string name="unstar">Fjern fra favoritter</string>
@@ -82,7 +82,7 @@
    <string name="failedOpeningFileManager">Installer en filbehandler først.</string>
    <string name="leaveWithoutSaveConfirmation">Forlat uten å lagre?</string>
    <string name="leaveWithoutSaveTitle">Avslutt</string>
-    <string name="addManually">Skriv inn ID manuelt</string>
+    <string name="addManually">Skriv inn kort-ID manuelt</string>
    <string name="moveDown">Flytt nedover</string>
    <string name="moveUp">Flytt oppover</string>
    <plurals name="groupCardCount">
@@ -122,7 +122,7 @@
    <string name="addFromImage">Velg bilde fra galleri</string>
    <string name="unsupportedBarcodeType">Denne strekkodetypen kan ikke vises for øyeblikket. Støtte kan bli lagt til i en senere versjon av programmet.</string>
    <string name="setBarcodeId">Sett strekkodeverdi</string>
-    <string name="sameAsCardId">Samme som ID</string>
+    <string name="sameAsCardId">Samme som kort-ID</string>
    <string name="barcodeId">Strekkodeverdi</string>
    <string name="importVoucherVaultMessage">Velg din <i>vouchervault.json</i>-eksport fra Voucher Vault å importere.
 \nOpprett den ved å trykke «Eksport» i Voucher Vault først.</string>
@@ -135,12 +135,12 @@
    <string name="settings_max_font_size_scale">Maks. skriftstørrelse</string>
    <string name="wrongValueForBarcodeType">Verdien er ikke gyldig for valgt strekkodetype</string>
    <string name="intent_import_card_from_url_share_multiple_text">Jeg vil dele noen kort med deg</string>
-    <string name="copy_to_clipboard_multiple_toast">ID-er ble kopiert til utklippstavle</string>
+    <string name="copy_to_clipboard_multiple_toast">Kort-ID-er kopiert til utklippstavle</string>
    <string name="app_resources">Frie tredjepartsressurser: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="app_libraries">Frie tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="card_ids_copied">Kopierte ID(er)</string>
+    <string name="card_ids_copied">Kopierte kort-ID(er)</string>
    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Opphavsrett © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
-    <string name="updateBarcodeQuestionText">Du har endret ID-en. Ønsker du å også oppdatere strekkoden til samme verdi\?</string>
+    <string name="updateBarcodeQuestionText">Du har endret kortets ID. Ønsker du å også oppdatere strekkoden til samme verdi?</string>
    <string name="no">Nei</string>
    <string name="yes">Ja</string>
    <string name="updateBarcodeQuestionTitle">Oppdater strekkodeverdi?</string>
@@ -149,16 +149,16 @@
    <string name="setBackImage">Sett bakside</string>
    <string name="setFrontImage">Sett forside</string>
    <string name="photos">Bilder</string>
-    <string name="backImageDescription">Baksidebilde</string>
-    <string name="frontImageDescription">Forsidebilde</string>
+    <string name="backImageDescription">Kortets bakside</string>
+    <string name="frontImageDescription">Kortets forside</string>
    <string name="importStocardMessage">Velg din <i>***-sync.zip</i>-eksport fra Stocard å importere.
 \nSkaff den ved å sende e-post til support@stocardapp.com der du etterspør eksport av dataen din.</string>
    <string name="passwordRequired">Skriv inn passordet</string>
    <string name="importStocard">Importer fra Stocard</string>
    <string name="failedGeneratingShareURL">Klarte ikke å lage delbar nettadresse. Rapporter denne feilen.</string>
    <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> valgt</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> valgt</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> kort valgt</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kort valgt</item>
    </plurals>
    <string name="deleteConfirmation">Slett dette kortet for godt?</string>
    <plurals name="deleteCardsConfirmation">
@@ -185,12 +185,12 @@
    <string name="settings_pink_theme">Rosa</string>
    <string name="settings_catima_theme">Catima</string>
    <string name="settings_theme_color">Draktfarge</string>
-    <string name="noGroupCards">Denne gruppen er tom</string>
+    <string name="noGroupCards">Denne gruppen inneholder ikke noen kort</string>
    <string name="toggleMoreInfo">Veksle visning av mer info</string>
-    <string name="barcodeImageDescriptionWithType">Bilde av <xliff:g>%s</xliff:g>-strekkode</string>
+    <string name="barcodeImageDescriptionWithType">Bilde av kortstrekkode av typen <xliff:g>%s</xliff:g></string>
    <string name="swipeToSwitchImages">Dra eller hold lenge for å bygge bilder</string>
    <string name="sort_by">Sorter etter</string>
-    <string name="reverse">…i omvendt rekkefølge</string>
+    <string name="reverse">Vend</string>
    <string name="sort_by_balance">Saldo</string>
    <string name="sort_by_expiry">Utløp</string>
    <string name="sort_by_most_recently_used">Nyligst brukt</string>
@@ -215,12 +215,9 @@
    <string name="group_updated">Gruppe oppdatert</string>
    <string name="group_name_is_empty">Gruppenavn kan ikke være tomt</string>
    <string name="editGroup">Redigerer gruppe: <xliff:g>%s</xliff:g></string>
-    <string name="noGiftCardsGroup">Lag noen kort, og legg dem til i en gruppe her.</string>
+    <string name="noGiftCardsGroup">Du har ingen lojalitetskort enda. Når du først har det kan du legge dem til i en gruppe her.</string>
    <string name="action_show_details">Vis detaljer</string>
    <string name="action_hide_details">Skjul detaljer</string>
    <string name="selectColor">Velg farge</string>
    <string name="setIcon">Sett ikon</string>
-    <string name="shortcutSelectCard">velg et kort</string>
-    <string name="translate_platform">på Weblate</string>
-    <string name="options">Alternativer</string>
 </resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -34,10 +34,10 @@
    <string name="importExportHelp">Door je gegevens te back-uppen, kun je ze overzetten naar een ander apparaat.</string>
    <string name="importSuccessfulTitle">Importeren voltooid</string>
    <string name="importFailedTitle">Importeren mislukt</string>
-    <string name="importFailed">Het importeren is mislukt</string>
+    <string name="importFailed">Het importeren is mislukt: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Exporteren voltooid</string>
    <string name="exportFailedTitle">Exporteren mislukt</string>
-    <string name="exportFailed">Het exporteren is mislukt</string>
+    <string name="exportFailed">Het exporteren is mislukt: <xliff:g>%s</xliff:g></string>
    <string name="importing">Bezig met importeren…</string>
    <string name="exporting">Bezig met exporteren…</string>
    <string name="noExternalStoragePermissionError">Verleen het recht ‘externe opslag’ om gegevens te kunnen im- of exporteren</string>
@@ -222,5 +222,4 @@
    <string name="action_hide_details">Details verbergen</string>
    <string name="translate_platform">op Weblate</string>
    <string name="shortcutSelectCard">Kies een kaart</string>
-    <string name="options">Opties</string>
 </resources>
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -2,9 +2,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="exporting">Exportacion…</string>
    <string name="importing">Importacion…</string>
-    <string name="exportFailed">Exportacion pas possibla</string>
+    <string name="exportFailed">Exportacion pas possibla: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Exportat</string>
-    <string name="importFailed">Importacion de vòstras cartas impossibla</string>
+    <string name="importFailed">Importacion de vòstras cartas impossibla: <xliff:g>%s</xliff:g></string>
    <string name="importFailedTitle">Fracàs de l’importacion</string>
    <string name="importSuccessfulTitle">Importat</string>
    <string name="importExportHelp">Exportar vòstras cartas vos permet de las recuperar sus un autre aparelh.</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2,12 +2,12 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
    <string name="action_search">Szukaj</string>
    <string name="action_add">Dodaj</string>
-    <string name="noGiftCards">Kliknij przycisk + plus, aby dodać kartę lub zaimportuj z ⋮ menu.</string>
-    <string name="noMatchingGiftCards">Brak wyników. Spróbuj zmienić treść zapytania.</string>
+    <string name="noGiftCards">Kliknij przycisk + plus, aby dodać kartę lub zaimportuj jakieś z ⋮ menu w pierwszej kolejności.</string>
+    <string name="noMatchingGiftCards">Nic nie znaleziono. Spróbuj zmienić wyszukiwanie.</string>
    <string name="storeName">Nazwa</string>
    <string name="note">Notatka</string>
    <string name="cardId">Identyfikator karty</string>
-    <string name="barcodeNoBarcode">Nie ma kodu kreskowego</string>
+    <string name="barcodeNoBarcode">Ta karta nie ma kodu kreskowego</string>
    <string name="cancel">Anuluj</string>
    <string name="save">Zapisz</string>
    <string name="edit">Edytuj</string>
@@ -21,25 +21,25 @@
    <string name="sendLabel">Wyślij…</string>
    <string name="editCardTitle">Edytuj kartę lojalnościową</string>
    <string name="addCardTitle">Dodaj kartę lojalnościową</string>
-    <string name="scanCardBarcode">Zeskanuj kod kreskowy</string>
+    <string name="scanCardBarcode">Zeskanuj kod kreskowy karty lojalnościowej</string>
    <string name="cardShortcut">Skrót karty</string>
    <string name="noCardsMessage">Najpierw dodaj kartę</string>
    <string name="noStoreError">Nie wprowadzono nazwy</string>
-    <string name="noCardIdError">Nie wprowadzono identyfikatora</string>
+    <string name="noCardIdError">Nie wprowadzono identyfikatora karty</string>
    <string name="noCardExistsError">Nie można wyszukać karty lojalnościowej</string>
    <string name="failedParsingImportUriError">Nie można przeanalizować identyfikatora importu URI</string>
    <string name="importExport">Importuj/Eksportuj</string>
    <string name="exportName">Eksportuj</string>
-    <string name="importExportHelp">Kopie zapasowe umożliwiają przeniesienie kart na inne urządzenie.</string>
+    <string name="importExportHelp">Zarchiwizowane dane umożliwiają przeniesienie kart na inne urządzenie.</string>
    <string name="importSuccessfulTitle">Zaimportowano</string>
    <string name="importFailedTitle">Import nie powiódł się</string>
-    <string name="importFailed">Nie udało się zaimportować</string>
+    <string name="importFailed">Nie udało się zaimportować: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Wyeksportowano</string>
    <string name="exportFailedTitle">Eksport nie powiódł się</string>
-    <string name="exportFailed">Nie udało się wyeksportować</string>
+    <string name="exportFailed">Nie udało się wyeksportować: <xliff:g>%s</xliff:g></string>
    <string name="importing">Importowanie…</string>
    <string name="exporting">Eksportowanie…</string>
-    <string name="noExternalStoragePermissionError">Przyznaj uprawnienia pamięci zewnętrznej, aby importować lub eksportować dane</string>
+    <string name="noExternalStoragePermissionError">Najpierw przyznaj uprawnienia pamięci zewnętrznej do importowania lub eksportowania kart</string>
    <string name="importOptionFilesystemTitle">Importuj z systemu plików</string>
    <string name="importOptionFilesystemExplanation">Wybierz określony plik z systemu plików.</string>
    <string name="importOptionFilesystemButton">Z systemu plików</string>
@@ -47,14 +47,14 @@
    <string name="importOptionApplicationExplanation">Użyj dowolnej aplikacji lub ulubionego menedżera plików, aby otworzyć plik.</string>
    <string name="importOptionApplicationButton">Użyj innej aplikacji</string>
    <string name="about">O aplikacji</string>
-    <string name="app_license">Wolne oprogramowanie typu copyleft, na licencji GPLv3+</string>
+    <string name="app_license">Wolne oprogramowanie copylefted, licencjonowane GPLv3 +.</string>
    <string name="about_title_fmt">O <xliff:g id="app_name">%s</xliff:g></string>
    <string name="debug_version_fmt">Wersja: <xliff:g id="version">%s</xliff:g></string>
    <string name="app_revision_fmt">Info o wydaniu: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="selectBarcodeTitle">Wybierz kod kreskowy</string>
-    <string name="enterBarcodeInstructions">Wprowadź ID, a następnie wybierz typ kodu kreskowego, którego chcesz użyć lub wybierz „Nie ma kodu kreskowego”.</string>
-    <string name="copy_to_clipboard_toast">Skopiowano ID do schowka</string>
-    <string name="thumbnailDescription">Miniaturka</string>
+    <string name="enterBarcodeInstructions">Wprowadź ID karty, a następnie wybierz typ kodu kreskowego, którego chcesz użyć lub wybierz „Ta karta nie ma kodu kreskowego”.</string>
+    <string name="copy_to_clipboard_toast">Skopiowano ID karty do schowka</string>
+    <string name="thumbnailDescription">Miniaturka karty</string>
    <string name="settings">Ustawienia</string>
    <string name="settings_category_title_ui">Interfejs użytkownika</string>
    <string name="settings_theme">Motyw</string>
@@ -66,14 +66,14 @@
    <string name="intent_import_card_from_url_share_text">Chcę udostępnić Ci kartę lojalnościową</string>
    <string name="deleteConfirmationGroup">Usunąć grupę\?</string>
    <string name="all">Wszystko</string>
-    <string name="noGroups">Kliknij przycisk + plus, aby dodać grupy w celu kategoryzacji.</string>
+    <string name="noGroups">Najpierw kliknij przycisk + plus, aby dodać grupy dla kategoryzacji.</string>
    <string name="groups">Grupy</string>
    <string name="enter_group_name">Wpisz nazwę grupy</string>
-    <string name="exportSuccessful">Dane zostały wyeksportowane</string>
-    <string name="importSuccessful">Zaimportowano dane</string>
+    <string name="exportSuccessful">Dane karty zostały wyeksportowane</string>
+    <string name="importSuccessful">Zaimportowano dane karty</string>
    <string name="starImage">Ulubiona gwiazda</string>
    <string name="app_copyright_old">Na podstawie Loyalty Card Keychain
-\nWszelkie prawa zastrzeżone © 2016–2020 Branden Archer</string>
+\nWszelkie prawa zastrzeżone © 2016–2020 Branden Archer.</string>
    <string name="exportOptionExplanation">Dane zostaną zapisane w wybranym przez Ciebie miejscu.</string>
    <string name="unstar">Usuń z ulubionych</string>
    <string name="star">Dodaj do ulubionych</string>
@@ -100,36 +100,36 @@
    <string name="passwordRequired">Proszę wpisać hasło</string>
    <string name="no">Nie</string>
    <string name="yes">Tak</string>
-    <string name="updateBarcodeQuestionText">Zmieniłeś ID. Czy chcesz zaktualizować kod kreskowy, aby używał tej samej wartości\?</string>
+    <string name="updateBarcodeQuestionText">Zmieniłeś ID karty. Czy chcesz zaktualizować kod kreskowy, aby używał tej samej wartości\?</string>
    <string name="updateBarcodeQuestionTitle">Zaktualizować wartość kodu kreskowego\?</string>
    <string name="takePhoto">Zrób zdjęcie</string>
    <string name="removeImage">Usuń zdjęcie</string>
    <string name="setBackImage">Ustaw tylne zdjęcie</string>
    <string name="setFrontImage">Ustaw zdjęcie przednie</string>
    <string name="photos">Zdjęcia</string>
-    <string name="backImageDescription">Zdjęcie tylne</string>
-    <string name="frontImageDescription">Zdjęcie przednie</string>
+    <string name="backImageDescription">Zdjęcie tylne karty</string>
+    <string name="frontImageDescription">Zdjęcie przednie karty</string>
    <string name="intent_import_card_from_url_share_multiple_text">Chcę Ci udostępnić karty</string>
-    <string name="copy_to_clipboard_multiple_toast">Skopiowano ID do schowka</string>
+    <string name="copy_to_clipboard_multiple_toast">Skopiowano ID karty do schowka</string>
    <string name="wrongValueForBarcodeType">Wartość nie jest prawidłowa dla wybranego typu kodu kreskowego</string>
    <string name="unsupportedBarcodeType">Nie można jeszcze wyświetlić tego typu kodu kreskowego. Być może będzie on obsługiwany w nowszej wersji aplikacji.</string>
    <string name="setBarcodeId">Ustaw wartość kodu kreskowego</string>
-    <string name="sameAsCardId">Taki sam jak ID</string>
+    <string name="sameAsCardId">Taki sam jak ID karty</string>
    <string name="barcodeId">Wartość kodu kreskowego</string>
    <string name="importVoucherVaultMessage">Wybierz swój <i>vouchervault.json</i> z Voucher Vault, aby zaimportować.
-\nUtwórz go wpierw klikając Eksportuj w Voucher Vault.</string>
+\nLub utwórz go wpierw klikając Eksportuj w Voucher Vault.</string>
    <string name="importVoucherVault">Importuj z Voucher Vault</string>
    <string name="importStocardMessage">Wybierz swój <i>***-sync.zip</i> z Stocard, aby zaimportować.
-\nUzyskaj go, wysyłając email na adres support@stocardapp.com, z prośbą o eksport Twoich danych.</string>
+\nLub uzyskaj go, wysyłając email na adres support@stocardapp.com, z prośbą o eksport Twoich danych.</string>
    <string name="importStocard">Importuj z Stocard</string>
    <string name="importLoyaltyCardKeychainMessage">Wybierz swój <i>LoyaltyCardKeychain.csv</i> z Loyalty Card Keychain, aby zaimportować.
-\nUtwórz go z menu Importuj/Eksportuj w Loyalty Card Keychain, wpierw klikając tam Eksportuj.</string>
+\nLub utwórz go z menu Importuj/Eksportuj w Loyalty Card Keychain, wpierw klikając tam Eksportuj.</string>
    <string name="importLoyaltyCardKeychain">Importuj z Loyalty Card Keychain</string>
    <string name="importFidmeMessage">Wybierz swój <i>fidme-export-request-xxxxxx.zip</i> z FidMe, aby zaimportować, po czym wybierz typy kodów kreskowych.
-\nStwórz go ze swojego profilu FidMe, wybierając wpierw Ochrona Danych, a następnie naciskając Wyodrębnij moje dane.</string>
+\nLub stwórz go ze swojego profilu FidMe, wybierając wpierw Ochrona Danych, a następnie naciskając Wyodrębnij moje dane.</string>
    <string name="importFidme">Importuj z FidMe</string>
    <string name="importCatimaMessage">Wybierz swój <i>catima.zip</i> z Catima, aby zaimportować.
-\nUtwórz go z menu Importuj/Eksportuj innej aplikacji Catima, wpierw klikając tam Eksportuj.</string>
+\nLub utwórz go z menu Importuj/Eksportuj innej aplikacji Catima, wpierw klikając tam Eksportuj.</string>
    <string name="importCatima">Importuj z Catima</string>
    <string name="accept">Zaakceptuj</string>
    <string name="privacy_policy_popup_text">Informacja o polityce prywatności (wymagana przez niektóre sklepy z aplikacjami):
@@ -158,7 +158,7 @@
    <string name="expiryStateSentence">Wygasa: <xliff:g>%s</xliff:g></string>
    <string name="groupsList">Grupy: <xliff:g>%s</xliff:g></string>
    <string name="addFromImage">Wybierz zdjęcie z galerii</string>
-    <string name="addManually">Wpisz ręcznie ID</string>
+    <string name="addManually">Wpisz ręcznie ID karty</string>
    <string name="leaveWithoutSaveConfirmation">Wyjść bez zapisywania\?</string>
    <string name="leaveWithoutSaveTitle">Wyjdź</string>
    <string name="moveDown">Przesuń w dół</string>
@@ -170,14 +170,14 @@
        <item quantity="many"><xliff:g>%d</xliff:g> kart</item>
        <item quantity="other"><xliff:g>%d</xliff:g> kart</item>
    </plurals>
-    <string name="noGroupCards">Ta grupa jest pusta</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Zapobiegaj wygasaniu ekranu</string>
+    <string name="noGroupCards">Ta grupa nie zawiera żadnych kart</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Zapobiegaj blokowaniu ekranu</string>
    <string name="settings_keep_screen_on">Pozostaw ekran włączony</string>
    <string name="settings_max_font_size_scale">Maks. rozmiar czcionki</string>
    <string name="app_resources">Otwarte zewnętrzne zasoby: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="app_libraries">Otwarte zewnętrzne biblioteki: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Wszelkie prawa zastrzeżone © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
-    <string name="card_ids_copied">Skopiowano identyfikator(y)</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Wszelkie prawa zastrzeżone © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="card_ids_copied">Skopiowano ID karty</string>
    <plurals name="deleteCardsConfirmation">
        <item quantity="one">Usunąć tą <xliff:g>%d</xliff:g> kartę permamentnie\?</item>
        <item quantity="few">Usunąć te <xliff:g>%d</xliff:g> karty permamentnie\?</item>
@@ -191,43 +191,9 @@
        <item quantity="other">Usuń <xliff:g>%d</xliff:g> kart</item>
    </plurals>
    <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> zaznaczona</item>
-        <item quantity="few"><xliff:g>%d</xliff:g> zaznaczone</item>
-        <item quantity="many"><xliff:g>%d</xliff:g> zaznaczonych</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> zaznaczonych</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> wybrana karta</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> wybrane karty</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> wybranych kart</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> wybranych kart</item>
    </plurals>
-    <string name="toggleMoreInfo">Przełącz wyświetlanie większej ilości informacji</string>
-    <string name="shortcutSelectCard">Wybierz kartę</string>
-    <string name="action_show_details">Pokaż szczegóły</string>
-    <string name="action_hide_details">Ukryj szczegóły</string>
-    <string name="sort_by_name">Nazwa</string>
-    <string name="sort_by_most_recently_used">Ostatnio Użyte</string>
-    <string name="sort_by_expiry">Wygaśnięcie</string>
-    <string name="sort_by_balance">Balans</string>
-    <string name="sort_by">Sortuj według</string>
-    <string name="credits">Podziękowania</string>
-    <string name="help_translate_this_app">Pomóż przetłumaczyć tą aplikację</string>
-    <string name="source_repository">Repozytorium Źródłowe</string>
-    <string name="report_error">Zgłoś Błąd</string>
-    <string name="setIcon">Ustaw ikonę</string>
-    <string name="on_github">na GitHub\'ie</string>
-    <string name="swipeToSwitchImages">Przeciągnij lub przytrzymaj aby zmienić obraz</string>
-    <string name="selectColor">Wybierz kolor</string>
-    <string name="version_history">Historia Wersji</string>
-    <string name="and_data_usage">i wykorzystanie danych</string>
-    <string name="rate_this_app">Oceń tą aplikację</string>
-    <string name="license">Licencja</string>
-    <string name="on_google_play">w Google Play</string>
-    <string name="noGiftCardsGroup">Stwórz karty i przypisz je do grupy w tym miejscu.</string>
-    <string name="reverse">...w odwróconej kolejności</string>
-    <string name="translate_platform">na Weblate</string>
-    <string name="sort">Sortuj</string>
-    <string name="barcodeImageDescriptionWithType">Obraz kodu kreskowego typu <xliff:g>%s</xliff:g></string>
-    <string name="group_edit">Edytuj Grupę</string>
-    <string name="group_name_already_in_use">Ta nazwa jest już użyta</string>
-    <string name="group_name_is_empty">Nazwa grupy nie może być pusta</string>
-    <string name="group_updated">Zaktualizowano grupę</string>
-    <string name="editGroup">Edytowanie Grupy: <xliff:g>%s</xliff:g></string>
-    <string name="exportPassword">Ustaw hasło, aby zabezpieczyć twoje wyeksportowane dane (opcjonalne)</string>
-    <string name="exportPasswordHint">Wpisz hasło</string>
 </resources>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1,193 +1,2 @@
 <?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">
-    <string name="shortcutSelectCard">Selecione um cartão</string>
-    <string name="action_show_details">Mostrar detalhes</string>
-    <string name="action_hide_details">Ocultar detalhes</string>
-    <string name="lockScreen">Bloquear rotação</string>
-    <string name="unlockScreen">Desbloquear rotação</string>
-    <string name="deleteTitle">Eliminar cartão</string>
-    <string name="deleteConfirmation">Eliminar este cartão permanentemente\?</string>
-    <string name="ok">OK</string>
-    <string name="copy_to_clipboard">Copiar identificador para a área de transferência</string>
-    <string name="share">Partilhar</string>
-    <string name="sendLabel">Enviar…</string>
-    <string name="editCardTitle">Editar cartão</string>
-    <string name="addCardTitle">Adicionar cartão</string>
-    <string name="cardShortcut">Atalho do cartão</string>
-    <string name="noCardsMessage">Adicione primeiro um cartão</string>
-    <string name="noStoreError">Nenhum nome inserido</string>
-    <string name="failedParsingImportUriError">Não foi possível analisar o URI de importação</string>
-    <string name="importExport">Importar / exportar</string>
-    <string name="exportName">Exportar</string>
-    <string name="importSuccessfulTitle">Importado</string>
-    <string name="importFailedTitle">A importação falhou</string>
-    <string name="exportSuccessfulTitle">Exportado</string>
-    <string name="exportFailedTitle">A exportação falhou</string>
-    <string name="importOptionFilesystemExplanation">Escolha um ficheiro específico a partir do sistema de ficheiros.</string>
-    <string name="importOptionApplicationTitle">Usar outra aplicação</string>
-    <string name="importOptionApplicationExplanation">Utilize qualquer aplicação ou o seu gestor de ficheiros favorito para abrir um ficheiro.</string>
-    <string name="importOptionApplicationButton">Utilizar outra aplicação</string>
-    <string name="about">Sobre</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Direitos de autor © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
-    <string name="app_copyright_old">Baseado no Loyalty Card Keychain
-\ndireitos de autor © 2016–2020 Branden Archer</string>
-    <string name="app_license">Software livre de partilha sob a mesma licença e segundo a licença GPLv3+</string>
-    <string name="about_title_fmt">Sobre o <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="debug_version_fmt">Versão: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Informação da revisão: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries">Bibliotecas livres de terceiros: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources">Recursos livres de terceiros: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="selectBarcodeTitle">Selecionar código de barras</string>
-    <string name="starImage">Favorito</string>
-    <string name="settings">Configurações</string>
-    <string name="settings_category_title_ui">Interface do utilizador</string>
-    <string name="settings_theme">Tema</string>
-    <string name="settings_system_theme">Sistema</string>
-    <string name="settings_light_theme">Claro</string>
-    <string name="settings_dark_theme">Escuro</string>
-    <string name="settings_max_font_size_scale">Tamanho máximo da fonte</string>
-    <string name="settings_display_barcode_max_brightness">Iluminar o código de barras</string>
-    <string name="settings_lock_barcode_orientation">Bloquear orientação do código de barras</string>
-    <string name="settings_keep_screen_on">Manter ecrã ligado</string>
-    <string name="group_name_is_empty">O nome do grupo não pode estar vazio</string>
-    <string name="group_updated">Grupo atualizado</string>
-    <string name="all">Todos</string>
-    <string name="deleteConfirmationGroup">Eliminar o grupo\?</string>
-    <string name="failedOpeningFileManager">Instalar primeiro um gestor de ficheiros.</string>
-    <string name="moveUp">Subir</string>
-    <string name="moveDown">Descer</string>
-    <string name="leaveWithoutSaveTitle">Sair</string>
-    <string name="leaveWithoutSaveConfirmation">Sair sem guardar\?</string>
-    <string name="addFromImage">Selecionar imagem da galeria</string>
-    <string name="groupsList">Grupos: <xliff:g>%s</xliff:g></string>
-    <string name="editGroup">A editar grupo: <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentence">Expiram: <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentenceExpired">Expirados: <xliff:g>%s</xliff:g></string>
-    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> pontos</string>
-    <string name="card">Cartão</string>
-    <string name="barcode">Código de barras</string>
-    <string name="editBarcode">Editar código de barras</string>
-    <string name="expiryDate">Validade</string>
-    <string name="never">Nunca</string>
-    <string name="chooseExpiryDate">Escolher validade</string>
-    <string name="moveBarcodeToTopOfScreen">Mover o código de barras para o topo do ecrã</string>
-    <string name="moveBarcodeToCenterOfScreen">Centrar o código de barras no ecrã</string>
-    <string name="noBarcodeFound">Não foi encontrado nenhum código de barras</string>
-    <string name="errorReadingImage">Não foi possível ler a imagem</string>
-    <string name="balance">Saldo</string>
-    <string name="currency">Moeda</string>
-    <string name="privacy_policy_popup_text">Aviso de política de privacidade (exigido por algumas lojas de aplicações):
-\n
-\nNENHUM DADO É RECOLHIDO DE FORMA ALGUMA, o que qualquer pessoa pode confirmar, já que a nossa aplicação é um software livre de código-fonte aberto.</string>
-    <string name="accept">Aceitar</string>
-    <string name="importCatima">Importar do Catima</string>
-    <string name="importFidme">Importar do FidMe</string>
-    <string name="importFidmeMessage">Selecione a exportação <i>fidme-export-request-xxxxxx.zip</i> do FidMe para importar e depois selecione os tipos de código de barras manualmente.
-\nPrimeiro crie a exportação no seu perfil do FidMe escolhendo a opção \"Proteção de dados\" e em seguida pressionando \"Extrair os meus dados\".</string>
-    <string name="importLoyaltyCardKeychain">Importar do Loyalty Card Keychain</string>
-    <string name="importLoyaltyCardKeychainMessage">Selecione a exportação <i>LoyaltyCardKeychain.csv</i> do Loyalty Card Keychain para importar.
-\nPrimeiro crie a exportação no menu \"Importar / exportar\" no Loyalty Card Keychain pressionando \"Exportar\".</string>
-    <string name="importStocard">Importar do Stocard</string>
-    <string name="importCatimaMessage">Selecione a exportação <i>catima.zip</i> do Catima a importar.
-\nPrimeiro crie a exportação no menu \"Importar / exportar\" de outra aplicação Catima pressionando \"Exportar\" nesse menu.</string>
-    <string name="importStocardMessage">Selecione a exportação <i>***-sync.zip</i> do Stocard para importar.
-\nObtenha-o através do e-mail support@stocardapp.com solicitando uma exportação dos seus dados.</string>
-    <string name="importVoucherVault">Importar do Voucher Vault</string>
-    <string name="importVoucherVaultMessage">Selecione a exportação <i>vouchervault.json</i> do Voucher Vault para importar.
-\nCrie-a primeiro pressionando a opção \"Exportar\" no Voucher Vault.</string>
-    <string name="barcodeId">Valor do código de barras</string>
-    <string name="setBarcodeId">Definir o valor do código de barras</string>
-    <string name="unsupportedBarcodeType">Este tipo de código de barras ainda não pode ser mostrado. Pode vir a ser suportado numa versão posterior da aplicação.</string>
-    <string name="wrongValueForBarcodeType">O valor não é válido para o tipo de código de barras selecionado</string>
-    <string name="intent_import_card_from_url_share_multiple_text">Quero partilhar alguns cartões</string>
-    <string name="photos">Fotografias</string>
-    <string name="setFrontImage">Definir imagem frontal</string>
-    <string name="setBackImage">Definir imagem de trás</string>
-    <string name="removeImage">Remover imagem</string>
-    <string name="takePhoto">Tirar uma fotografia</string>
-    <string name="updateBarcodeQuestionTitle">Atualizar o valor do código de barras\?</string>
-    <string name="yes">Sim</string>
-    <string name="no">Não</string>
-    <string name="passwordRequired">Introduza a palavra-passe</string>
-    <string name="exportPassword">Defina uma palavra-passe para proteger a exportação (opcional)</string>
-    <string name="exportPasswordHint">Digite a palavra-passe</string>
-    <string name="failedGeneratingShareURL">Não foi possível gerar uma URL partilhável. Por favor reporte isto aos programadores.</string>
-    <string name="turn_flashlight_on">Ligar lanterna</string>
-    <string name="turn_flashlight_off">Desligar lanterna</string>
-    <string name="settings_locale">Idioma</string>
-    <string name="settings_system_locale">Sistema</string>
-    <string name="selectColor">Selecionar cor</string>
-    <string name="setIcon">Definir ícone</string>
-    <string name="settings_violet_theme">Violeta</string>
-    <string name="settings_blue_theme">Azul</string>
-    <string name="settings_sky_blue_theme">Azul céu</string>
-    <string name="settings_green_theme">Verde</string>
-    <string name="settings_grey_theme">Cinzento</string>
-    <string name="settings_brown_theme">Castanho</string>
-    <string name="app_contributors">Tornado possível por: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="sort">Ordenar</string>
-    <string name="toggleMoreInfo">Alternar mostrar mais informação</string>
-    <string name="swipeToSwitchImages">Deslize ou pressione prolongadamente para mudar as imagens</string>
-    <string name="sort_by_name">Nome</string>
-    <string name="sort_by_most_recently_used">Mais usados recentemente</string>
-    <string name="sort_by_expiry">Validade</string>
-    <string name="sort_by_balance">Saldo</string>
-    <string name="sort_by">Ordenar por</string>
-    <string name="version_history">Histórico de versões</string>
-    <string name="credits">Créditos</string>
-    <string name="help_translate_this_app">Ajude a traduzir esta aplicação</string>
-    <string name="license">Licença</string>
-    <string name="source_repository">Repositório do código-fonte</string>
-    <string name="on_github">no GitHub</string>
-    <string name="and_data_usage">e utilização de dados</string>
-    <string name="rate_this_app">Avalie esta aplicação</string>
-    <string name="on_google_play">no Google Play</string>
-    <string name="report_error">Reportar erro</string>
-    <string name="translate_platform">no Weblate</string>
-    <plurals name="deleteCardsTitle">
-        <item quantity="one">Eliminar <xliff:g>%d</xliff:g> cartão</item>
-        <item quantity="other">Eliminar <xliff:g>%d</xliff:g> cartões</item>
-    </plurals>
-    <plurals name="deleteCardsConfirmation">
-        <item quantity="one">Eliminar o cartão <xliff:g>%d</xliff:g> permanentemente\?</item>
-        <item quantity="other">Eliminar os cartões <xliff:g>%d</xliff:g> permanentemente\?</item>
-    </plurals>
-    <plurals name="groupCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> cartão</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> cartões</item>
-    </plurals>
-    <string name="action_search">Pesquisa</string>
-    <string name="action_add">Acrescentar</string>
-    <string name="storeName">Nome</string>
-    <string name="note">Nota</string>
-    <string name="cardId">Identificador do cartão</string>
-    <string name="barcodeType">Tipo de código de barras</string>
-    <string name="noBarcode">Sem código de barras</string>
-    <string name="star">Adicionar aos favoritos</string>
-    <string name="unstar">Retirar dos favoritos</string>
-    <string name="cancel">Cancelar</string>
-    <string name="save">Guardar</string>
-    <string name="edit">Editar</string>
-    <string name="delete">Eliminar</string>
-    <string name="confirm">Confirmar</string>
-    <string name="importing">A importar…</string>
-    <string name="exporting">A exportar…</string>
-    <string name="exportOptionExplanation">Os dados serão guardados num local à sua escolha.</string>
-    <string name="importOptionFilesystemTitle">Importar do sistema de ficheiros</string>
-    <string name="importOptionFilesystemButton">Do sistema de ficheiros</string>
-    <string name="intent_import_card_from_url_share_text">Quero partilhar um cartão</string>
-    <string name="enter_group_name">Introduza o nome do grupo</string>
-    <string name="groups">Grupos</string>
-    <string name="group_edit">Editar grupo</string>
-    <string name="group_name_already_in_use">O nome do grupo já está a ser usado</string>
-    <string name="points">Pontos</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> não parece ser um saldo válido.</string>
-    <string name="chooseImportType">De onde importar os dados\?</string>
-    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="privacy_policy">Política de privacidade</string>
-    <string name="settings_theme_color">Cor do tema</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Rosa</string>
-    <string name="settings_magenta_theme">Magenta</string>
-</resources>
+<resources></resources>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -78,10 +78,10 @@
    <string name="importExportHelp">A cópia de segurança dos seus cartões permite-lhe movê-los para outro dispositivo.</string>
    <string name="importSuccessfulTitle">Importado</string>
    <string name="importFailedTitle">A importação falhou</string>
-    <string name="importFailed">Não foi possível importar os cartões</string>
+    <string name="importFailed">Não foi possível importar os cartões: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Exportado</string>
    <string name="exportFailedTitle">A exportação falhou</string>
-    <string name="exportFailed">Não foi possível exportar os cartões</string>
+    <string name="exportFailed">Não foi possível exportar os cartões: <xliff:g>%s</xliff:g></string>
    <string name="importing">A importar…</string>
    <string name="exporting">A exportar…</string>
    <string name="settings_sky_blue_theme">Azul céu</string>
@@ -112,7 +112,7 @@
    <string name="photos">Fotografias</string>
    <string name="passwordRequired">Introduza a palavra-passe</string>
    <string name="settings_green_theme">Verde</string>
-    <string name="settings_grey_theme">Cinzento</string>
+    <string name="settings_grey_theme">Cinza</string>
    <string name="settings_brown_theme">Castanho</string>
    <string name="updateBarcodeQuestionTitle">Atualizar o valor do código de barras\?</string>
    <string name="updateBarcodeQuestionText">Alterou a identificação do cartão. Também quer atualizar o código de barras para usar o mesmo valor\?</string>
@@ -220,6 +220,4 @@
    <string name="setIcon">Definir ícone</string>
    <string name="action_show_details">Mostrar detalhes</string>
    <string name="action_hide_details">Ocultar detalhes</string>
-    <string name="shortcutSelectCard">Selecione um cartão</string>
-    <string name="translate_platform">no Weblate</string>
 </resources>
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -35,9 +35,9 @@
    <string name="exportName">Exportați</string>
    <string name="importSuccessfulTitle">Importat</string>
    <string name="importFailedTitle">Importul a eșuat</string>
-    <string name="importFailed">Nu s-a putut importa carduri</string>
+    <string name="importFailed">Nu s-a putut importa carduri: <xliff:g>%s</xliff:g></string>
    <string name="noCardIdError">Nu s-a introdus niciun ID de card</string>
-    <string name="exportFailed">Nu s-a putut exporta carduri</string>
+    <string name="exportFailed">Nu s-a putut exporta carduri: <xliff:g>%s</xliff:g></string>
    <string name="importing">Importul…</string>
    <string name="exporting">Exportul…</string>
    <string name="noExternalStoragePermissionError">Acordați mai întâi permisiunea de stocare externă pentru a importa sau exporta carduri</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -34,10 +34,10 @@
    <string name="importExportHelp">Резервное копирование данных позволяет перенести их на другое устройство.</string>
    <string name="importSuccessfulTitle">Импортировано</string>
    <string name="importFailedTitle">Импорт не выполнен</string>
-    <string name="importFailed">Невозможно выполнить импорт</string>
+    <string name="importFailed">Невозможно импортировать карты: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Экспортировано</string>
    <string name="exportFailedTitle">Экспорт не выполнен</string>
-    <string name="exportFailed">Невозможно выполнить экспорт</string>
+    <string name="exportFailed">Невозможно экспортировать карты: <xliff:g>%s</xliff:g></string>
    <string name="importing">Импорт…</string>
    <string name="exporting">Экспорт…</string>
    <string name="noExternalStoragePermissionError">Импорт или экспорт данных невозможен без разрешения на доступ к хранилищу</string>
@@ -230,5 +230,4 @@
    <string name="action_show_details">Показать детали</string>
    <string name="translate_platform">на Weblate</string>
    <string name="shortcutSelectCard">Выбор карты</string>
-    <string name="options">Настройки</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -28,10 +28,10 @@
    <string name="importExportHelp">Zálohovanie dát Vám umožní presunúť Vaše uložené karty na iné zariadenie.</string>
    <string name="importSuccessfulTitle">Import bol úspešný</string>
    <string name="importFailedTitle">Import zlyhal</string>
-    <string name="importFailed">Zlyhal import</string>
+    <string name="importFailed">Zlyhal import: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Export bol úspešný</string>
    <string name="exportFailedTitle">Export zlyhal</string>
-    <string name="exportFailed">Zlyhal export</string>
+    <string name="exportFailed">Zlyhal export: <xliff:g>%s</xliff:g></string>
    <string name="importing">Importujem…</string>
    <string name="exporting">Exportujem…</string>
    <string name="noExternalStoragePermissionError">Nie je možné importovať a exportovať karty bez prístupu k externému úložisku</string>
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -28,10 +28,10 @@
    <string name="importExportHelp">Varnostna kopija omogoča varen prenos kartic na druge naprave.</string>
    <string name="importSuccessfulTitle">Uvoz je bil uspešen</string>
    <string name="importFailedTitle">Uvoz ni uspel</string>
-    <string name="importFailed">Napaka pri uvozu</string>
+    <string name="importFailed">Napaka pri uvozu: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Izvoz je uspel</string>
    <string name="exportFailedTitle">Izvoz ni uspel</string>
-    <string name="exportFailed">Napaka pri izvozu</string>
+    <string name="exportFailed">Napaka pri izvozu: <xliff:g>%s</xliff:g></string>
    <string name="importing">Uvažanje…</string>
    <string name="exporting">Izvažanje…</string>
    <string name="noExternalStoragePermissionError">Izvažanje in uvažanje je nemogoče brez omogočenega dostopa do zunanje shrambe</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -99,8 +99,8 @@
    <string name="importOptionFilesystemTitle">Importera från filsystem</string>
    <string name="exporting">Exporterar…</string>
    <string name="importing">Importerar…</string>
-    <string name="exportFailed">Kunde inte genomföra export</string>
-    <string name="importFailed">Kunde inte genomföra import</string>
+    <string name="exportFailed">Kunde inte exportera kort: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Kunde inte importera kort: <xliff:g>%s</xliff:g></string>
    <string name="importSuccessfulTitle">Importen lyckades</string>
    <string name="importFailedTitle">Importen misslyckades</string>
    <string name="importExportHelp">Säkerhetskopiering av din data möjliggör förflyttning av den till en annan enhet.</string>
@@ -222,4 +222,4 @@
    <string name="noGiftCardsGroup">Skapa några kort och placera dem sedan i den här gruppen.</string>
    <string name="translate_platform">på Weblate</string>
    <string name="shortcutSelectCard">Välj ett kort</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -134,10 +134,10 @@
    <string name="noExternalStoragePermissionError">Verileri içeri veya dışarı aktarmak için harici depolama izni verin</string>
    <string name="exporting">Dışa aktarılıyor…</string>
    <string name="importing">İçe aktarılıyor…</string>
-    <string name="exportFailed">Dışa aktarma gerçekleştirilemedi</string>
+    <string name="exportFailed">Kartlar dışa aktarılamadı: <xliff:g>%s</xliff:g></string>
    <string name="exportFailedTitle">Dışa aktarılamadı</string>
    <string name="exportSuccessfulTitle">Dışa aktarıldı</string>
-    <string name="importFailed">İçe aktarma gerçekleştirilemedi</string>
+    <string name="importFailed">Kartlar içe aktarılamadı: <xliff:g>%s</xliff:g></string>
    <string name="importFailedTitle">İçe aktarılamadı</string>
    <string name="importSuccessfulTitle">İçe aktarıldı</string>
    <string name="importExportHelp">Verilerinizi yedeklemek, onları başka bir aygıta taşımanıza olanak tanır.</string>
@@ -222,5 +222,4 @@
    <string name="action_hide_details">Ayrıntıları gizle</string>
    <string name="translate_platform">Weblate\'de</string>
    <string name="shortcutSelectCard">Kart seç</string>
-    <string name="options">Seçenekler</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -111,10 +111,10 @@
    <string name="noExternalStoragePermissionError">Надайте дозвіл на доступ до пам\'яті пристрою для імпорту/експорту даних</string>
    <string name="exporting">Експортуємо…</string>
    <string name="importing">Імпортуємо…</string>
-    <string name="exportFailed">Неможливо здійснити експорт</string>
+    <string name="exportFailed">Неможливо експортувати картки: <xliff:g>%s</xliff:g></string>
    <string name="exportFailedTitle">Помилка експорту</string>
    <string name="exportSuccessfulTitle">Експортовано</string>
-    <string name="importFailed">Неможливо здійснити імпорт</string>
+    <string name="importFailed">Неможливо імпортувати картки: <xliff:g>%s</xliff:g></string>
    <string name="importFailedTitle">Помилка імпорту</string>
    <string name="importSuccessfulTitle">Імпортовано</string>
    <string name="importExportHelp">Резервна копія даних дозволяє перемістити їх до іншого пристрою.</string>
@@ -229,5 +229,4 @@
    <string name="action_show_details">Показати деталі</string>
    <string name="action_hide_details">Сховати деталі</string>
    <string name="translate_platform">на Weblate</string>
-    <string name="shortcutSelectCard">Оберіть карту</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -99,10 +99,10 @@
    <string name="noExternalStoragePermissionError">在导入导出前需要获得外部储存权限</string>
    <string name="exporting">导出中…</string>
    <string name="importing">导入中…</string>
-    <string name="exportFailed">无法导出卡片</string>
+    <string name="exportFailed">无法导出卡片: <xliff:g>%s</xliff:g></string>
    <string name="exportFailedTitle">导出失败</string>
    <string name="exportSuccessfulTitle">导出成功</string>
-    <string name="importFailed">无法导入卡片</string>
+    <string name="importFailed">无法导入卡片: <xliff:g>%s</xliff:g></string>
    <string name="importFailedTitle">导入失败</string>
    <string name="importSuccessfulTitle">导入成功</string>
    <string name="importExportHelp">备份数据允许你将其移动到另一个设备上。</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -56,7 +56,7 @@
    <string name="expiryDate">逾期日期</string>
    <string name="expiryStateSentence">逾期於：<xliff:g>%s</xliff:g></string>
    <string name="expiryStateSentenceExpired">已逾期：<xliff:g>%s</xliff:g></string>
-    <string name="exportFailed">無法匯出卡片</string>
+    <string name="exportFailed">無法匯出卡片: <xliff:g>%s</xliff:g></string>
    <string name="exportFailedTitle">匯出失敗</string>
    <string name="exporting">匯出中…</string>
    <string name="exportName">匯出</string>
@@ -73,7 +73,7 @@
    <string name="help_translate_this_app">幫助翻譯本程式</string>
    <string name="importExport">匯入/匯出</string>
    <string name="importFailedTitle">匯入失敗</string>
-    <string name="importFailed">無法匯入卡片</string>
+    <string name="importFailed">無法匯入卡片: <xliff:g>%s</xliff:g></string>
    <string name="importing">匯入中…</string>
    <string name="importSuccessfulTitle">已匯入</string>
    <string name="intent_import_card_from_url_share_multiple_text">我想要分享些卡片給你</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -61,10 +61,10 @@
    <string name="importExportHelp">Backing up your data allows moving it to another device.</string>
    <string name="importSuccessfulTitle">Imported</string>
    <string name="importFailedTitle">Import failed</string>
-    <string name="importFailed">Could not perform import</string>
+    <string name="importFailed">Could not import cards: <xliff:g>%s</xliff:g></string>
    <string name="exportSuccessfulTitle">Exported</string>
    <string name="exportFailedTitle">Export failed</string>
-    <string name="exportFailed">Could not perform export</string>
+    <string name="exportFailed">Could not export cards: <xliff:g>%s</xliff:g></string>
    <string name="importing">Importing…</string>
    <string name="exporting">Exporting…</string>
    <string name="noExternalStoragePermissionError">Grant external storage permission to import or export data</string>
@@ -257,7 +257,9 @@
    <string name="report_error">Report Error</string>
    <string name="action_show_details">Show details</string>
    <string name="action_hide_details">Hide details</string>
+    <string name="unknown_failure">Unknown failure</string>
+    <string name="incorrect_password">Incorrect password</string>
+    <string name="importExportDescription">Notifications about importing or exporting card data</string>
    <string name="translate_platform">on Weblate</string>
    <string name="shortcutSelectCard">Select a card</string>
-    <string name="options">Options</string>
 </resources>
--- a/fastlane/metadata/android/bg/title.txt
+++ b/fastlane/metadata/android/bg/title.txt
@@ -1 +0,0 @@
-Catima
--- a/fastlane/metadata/android/cs_CZ/title.txt
+++ b/fastlane/metadata/android/cs_CZ/title.txt
@@ -1 +0,0 @@
-Catima
--- a/fastlane/metadata/android/en-US/changelogs/96.txt
+++ b/fastlane/metadata/android/en-US/changelogs/96.txt
@@ -1,2 +1 @@
- Add CODE 93 support
- Various minor bugfixes and improvements
+- Add CODE 93 support
--- a/fastlane/metadata/android/en-US/changelogs/97.txt
+++ b/fastlane/metadata/android/en-US/changelogs/97.txt
@@ -1,4 +0,0 @@
- Fixed pressing the save button multiple times creating multiple entries
- Lower card header size when hiding details to fit even more cards
- Restructure edit screen
- Improve star icon contrast in main view
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png
--- a/fastlane/metadata/android/es-ES/title.txt
+++ b/fastlane/metadata/android/es-ES/title.txt
@@ -1 +1 @@
-Catima
+Catima — La Billetera Open Source para Tarjetas
--- a/fastlane/metadata/android/fi-FI/title.txt
+++ b/fastlane/metadata/android/fi-FI/title.txt
@@ -1 +1 @@
-Catima
+Catima — Open Source korttilompakko
--- a/fastlane/metadata/android/nb-NO/changelogs/49.txt
+++ b/fastlane/metadata/android/nb-NO/changelogs/49.txt
@@ -1,2 +0,0 @@
- Forbedrede oversettelser
- Små grensesnittsfikser
--- a/fastlane/metadata/android/nb-NO/title.txt
+++ b/fastlane/metadata/android/nb-NO/title.txt
@@ -1 +1 @@
-Catima
+Catima — for kundekort, billetter og kuponger
--- a/fastlane/metadata/android/sv-SE/title.txt
+++ b/fastlane/metadata/android/sv-SE/title.txt
@@ -1 +1 @@
-Catima
+Catima — Kortplånboken med öppen källkod
--- a/fastlane/metadata/android/tr-TR/changelogs/20.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/20.txt
@@ -1 +0,0 @@
- Bazı Android sürümlerinde (muhtemelen Android 5 ve altı) kurulum sırasında çökmeye geçici çözüm. (https://github.com/brarcher/loyalty-card-locker/pull/184)
--- a/fastlane/metadata/android/tr-TR/changelogs/28.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/28.txt
@@ -1,5 +0,0 @@
- Eklenen çeviriler:
-  - Lehçe (https://github.com/brarcher/loyalty-card-locker/pull/232)
-  - İspanyolca (https://github.com/brarcher/loyalty-card-locker/pull/232)
-  - Slovakça (https://github.com/brarcher/loyalty-card-locker/pull/232)
- Çeviriler güncellendi (https://github.com/brarcher/loyalty-card-locker/pull/239)
--- a/fastlane/metadata/android/tr-TR/changelogs/29.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/29.txt
@@ -1,2 +0,0 @@
- İspanyolca çeviriler düzeltildi (https://github.com/brarcher/loyalty-card-locker/pull/244)
- Çeviriler güncellendi (https://github.com/brarcher/loyalty-card-locker/pull/244)
--- a/fastlane/metadata/android/tr-TR/changelogs/3.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/3.txt
@@ -1,14 +0,0 @@
- Artık aşağıdaki 1B ve 2B barkodlar resmi olarak destekleniyor:
-  - AZTEC
-  - CODABAR
-  - CODE_39
-  - CODE_128
-  - DATA_MATRIX
-  - EAN_8
-  - EAN_13
-  - ITF
-  - PDF_417
-  - QR_CODE
-  - UPC_A
-
- Oluşturulan barkodlar daha büyük, bir tarama aygıtından taranması daha kolay
--- a/fastlane/metadata/android/tr-TR/changelogs/32.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/32.txt
@@ -1 +0,0 @@
- Barkodu elle girerek yeni kart oluşturma düzeltildi (https://github.com/brarcher/loyalty-card-locker/issues/272)
--- a/fastlane/metadata/android/tr-TR/changelogs/33.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/33.txt
@@ -1 +0,0 @@
- Çeviriler güncellendi ve yenileri eklendi
--- a/fastlane/metadata/android/tr-TR/changelogs/34.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/34.txt
@@ -1 +0,0 @@
- Rusça çeviriler güncellendi
--- a/fastlane/metadata/android/tr-TR/changelogs/35.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/35.txt
@@ -1,2 +0,0 @@
- Uygulama yedeklemeleri etkinleştirildi
- Fransızca ve Slovence çeviriler güncellendi
--- a/fastlane/metadata/android/tr-TR/changelogs/37.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/37.txt
@@ -1 +0,0 @@
- Arka plan rengi olmayan kartları paylaşma sorunu düzeltildi (https://github.com/brarcher/loyalty-card-locker/pull/343)
--- a/fastlane/metadata/android/tr-TR/changelogs/42.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/42.txt
@@ -1 +0,0 @@
- Grup olmadan aramada çökme düzeltildi
--- a/fastlane/metadata/android/tr-TR/changelogs/43.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/43.txt
@@ -1,3 +0,0 @@
- Düzenleme arayüzü iyileştirildi
- Başlık metni rengi seçeneği kaldırıldı (artık parlaklığa göre otomatik olarak oluşturuluyor)
- Çeviriler güncellendi
--- a/fastlane/metadata/android/tr-TR/changelogs/46.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/46.txt
@@ -1 +0,0 @@
- Ekranlar ve oturumlar arasında etkin grup sekmesini hatırla
--- a/fastlane/metadata/android/tr-TR/changelogs/49.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/49.txt
@@ -1,2 +0,0 @@
- Çeviriler iyileştirildi
- Küçük kullanıcı arayüzü düzeltmeleri
--- a/fastlane/metadata/android/tr-TR/changelogs/58.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/58.txt
@@ -1 +0,0 @@
- Android 7'den önceki sürümlerde çökme düzeltildi
--- a/fastlane/metadata/android/tr-TR/changelogs/59.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/59.txt
@@ -1,2 +0,0 @@
- Bakiye desteği eklendi
- Düzenleme görünümünün barkod sekmesi yeniden düzenlendi
--- a/fastlane/metadata/android/tr-TR/changelogs/61.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/61.txt
@@ -1,2 +0,0 @@
- Bakiye ayrıştırma mantığı iyileştirildi
- Ana ekranda para birimi ondalık gösterimi düzeltildi
--- a/fastlane/metadata/android/tr-TR/changelogs/62.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/62.txt
@@ -1 +0,0 @@
- Ayırıcı olarak boşluk kullanan ülkeler için bakiye ayrıştırma düzeltildi
--- a/fastlane/metadata/android/tr-TR/changelogs/71.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/71.txt
@@ -1,2 +0,0 @@
- Birkaç küçük çeviri ve kullanıcı arayüzü düzeltmesi
- Android 6'da kart içe aktarma/paylaşmada çökme düzeltildi
--- a/fastlane/metadata/android/tr-TR/changelogs/73.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/73.txt
@@ -1 +0,0 @@
- Mevcut kartı düzenlerken fotoğraf yükleme düzeltildi
--- a/fastlane/metadata/android/tr-TR/changelogs/96.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/96.txt
@@ -1,2 +1 @@
 - CODE 93 desteği eklendi
- Çeşitli küçük hata düzeltmeleri ve iyileştirmeler
--- a/fastlane/metadata/android/tr-TR/changelogs/97.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/97.txt
@@ -1,4 +0,0 @@
- Kaydet düğmesine birden çok basmanın yeni girdiler oluşturması düzeltildi
- Ayrıntıları gizlerken daha da fazla kart sığdırmak için daha kart başlığı boyutu azaltıldı
- Düzenleme ekranı yeniden yapılandırıldı
- Ana görünümde yıldız simgesi karşıtlığı iyileştirildi
--- a/fastlane/metadata/android/uk/title.txt
+++ b/fastlane/metadata/android/uk/title.txt
@@ -1 +1 @@
-Catima — гаман для карт
+Catima — Libre гаман для карт
Author	SHA1	Message	Date
Sylvia van Os	a434397551	Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker into fix/deprecatedProgressDialog	2021-12-18 14:48:13 +01:00
Sylvia van Os	ae1ccab059	Replace ProgressDialog with notification	2021-11-28 21:48:48 +01:00
				`@@ -1 +0,0 @@`
				`- Bazı Android sürümlerinde (muhtemelen Android 5 ve altı) kurulum sırasında çökmeye geçici çözüm. (https://github.com/brarcher/loyalty-card-locker/pull/184)`
				`@@ -1 +0,0 @@`
				`- Barkodu elle girerek yeni kart oluşturma düzeltildi (https://github.com/brarcher/loyalty-card-locker/issues/272)`
				`@@ -1 +0,0 @@`
				`- Çeviriler güncellendi ve yenileri eklendi`
				`@@ -1 +0,0 @@`
				`- Arka plan rengi olmayan kartları paylaşma sorunu düzeltildi (https://github.com/brarcher/loyalty-card-locker/pull/343)`
				`@@ -1 +0,0 @@`
				`- Ekranlar ve oturumlar arasında etkin grup sekmesini hatırla`
				`@@ -1 +0,0 @@`
				`- Android 7'den önceki sürümlerde çökme düzeltildi`
				`@@ -1 +0,0 @@`
				`- Ayırıcı olarak boşluk kullanan ülkeler için bakiye ayrıştırma düzeltildi`
				`@@ -1 +0,0 @@`
				`- Mevcut kartı düzenlerken fotoğraf yükleme düzeltildi`