Release Catima 2.12.0

Merge #697
697: Translations update from Hosted Weblate r=TheLastProject a=weblate Translations update from [Hosted Weblate](https://hosted.weblate.org) for [Catima/Catima](https://hosted.weblate.org/projects/catima/catima/). It also includes following components: * [Catima/Fastlane](https://hosted.weblate.org/projects/catima/fastlane/) Current translation status: ![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg) Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>
2025-12-24 15:47:53 -05:00 · 2021-12-23 17:41:06 +01:00 · 2021-12-23 16:03:57 +00:00 · 2021-12-23 16:53:14 +01:00 · 2021-12-21 23:01:58 +01:00 · 2021-12-21 21:58:54 +00:00
42 changed files with 247 additions and 213 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
 # Changelog

-## Unreleased - 96
+## v2.12.0 - 96 (2021-12-23)

 - 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 95
-        versionName "2.11.2"
+        versionCode 96
+        versionName "2.12.0"

        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,10 +1,7 @@
 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;
@@ -25,7 +22,6 @@ 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;
@@ -58,12 +54,6 @@ 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);
@@ -104,7 +94,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 != null ? exportPassword.toCharArray() : null, true);
+                startExport(writer, uri, exportPassword.toCharArray(), true);
            } catch (IOException e) {
                Log.e(TAG, "Failed to export file: " + result.toString(), e);
                onExportComplete(ImportExportResult.GenericFailure, uri);
@@ -266,59 +256,22 @@ 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 = (result, dataFormat1) -> {
-            onImportComplete(result, targetUri, dataFormat1);
-            if (closeWhenDone) {
-                try {
-                    target.close();
-                } catch (IOException ioException) {
-                    ioException.printStackTrace();
+        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();
+                    }
                }
            }
        };

-        startProgressNotification(true);
        importExporter = new ImportExportTask(ImportExportActivity.this,
                dataFormat, target, password, listener);
        mTasks.executeTask(TaskHandler.TYPE.IMPORT, importExporter);
@@ -326,18 +279,20 @@ 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 = (result, dataFormat) -> {
-            onExportComplete(result, targetUri);
-            if (closeWhenDone) {
-                try {
-                    target.close();
-                } catch (IOException ioException) {
-                    ioException.printStackTrace();
+        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();
+                    }
                }
            }
        };

-        startProgressNotification(false);
        importExporter = new ImportExportTask(ImportExportActivity.this,
                DataFormat.Catima, target, password, listener);
        mTasks.executeTask(TaskHandler.TYPE.EXPORT, importExporter);
@@ -403,27 +358,72 @@ 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) {
-        PendingIntent pendingIntent = null;
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+
+        int messageId;

        if (result == ImportExportResult.Success) {
-            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);
+            builder.setTitle(R.string.exportSuccessfulTitle);
+            messageId = R.string.exportSuccessful;
+        } else {
+            builder.setTitle(R.string.exportFailedTitle);
+            messageId = R.string.exportFailed;
        }

-        endProgressNotification(false, result, pendingIntent);
+        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();
    }
 }
--- 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.NotificationManager;
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.database.sqlite.SQLiteDatabase;
@@ -13,7 +13,6 @@ 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;
@@ -23,13 +22,15 @@ import protect.card_locker.importexport.MultiFormatImporter;
 public class ImportExportTask implements CompatCallable<ImportExportResult> {
    private static final String TAG = "Catima";

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

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

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

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

-        return result;
+        return importResult;
    }

    private ImportExportResult performExport(Context context, OutputStream stream, SQLiteDatabase database, char[] password) {
@@ -83,6 +84,20 @@ 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;
@@ -99,15 +114,15 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
    }

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

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

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

    protected void stop() {
--- a/app/src/main/java/protect/card_locker/NotificationType.java
+++ b/app/src/main/java/protect/card_locker/NotificationType.java
@@ -1,29 +0,0 @@
-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/raw/contributors.txt
+++ b/app/src/main/res/raw/contributors.txt
@@ -10,8 +10,8 @@ Oğuz Ersen
 IllusiveMan196
 Petr Novák
 Taco
-Gediminas Murauskas
 Joel A
+Gediminas Murauskas
 StoyanDimitrov
 Nyatsuki
 Altonss
@@ -20,14 +20,14 @@ arno-github
 Ankit Tiwari
 Sergio Paredes
 laralem
+Michael Moroni
 arshbeerSingh
 huuhaa
 Miha Frangež
-Michael Moroni
+sr093906
 Olivia (Zoe)
 betsythefc
 waffshappen
-sr093906
 K. Herbert
 Quentin PAGÈS
 String E. Fighter
--- 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">Картите не могат да бъдат изнесени: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Картите не могат да бъдат изнесени</string>
    <string name="exportFailedTitle">Грешка при изнасяне</string>
-    <string name="importFailed">Картите не могат да бъдат внесени: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Картите не могат да бъдат внесени</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: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Nelze importovat karty</string>
    <string name="exportSuccessfulTitle">Exportovat</string>
    <string name="exportFailedTitle">Export selhal</string>
-    <string name="exportFailed">Nelze exportovat karty: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Nelze exportovat karty</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>
--- 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: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Kunne ikke importere kort</string>
    <string name="exportSuccessfulTitle">Eksporteret</string>
    <string name="exportFailedTitle">Eksport mislykkedes</string>
-    <string name="exportFailed">Kunne ikke eksportere kort: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Kunne ikke eksportere kort</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">Karten konnten nicht importiert werden: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Import konnte nicht durchgeführt werden</string>
    <string name="exportSuccessfulTitle">Exportiert</string>
    <string name="exportFailedTitle">Export fehlgeschlagen</string>
-    <string name="exportFailed">Karten konnten nicht exportiert werden: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Export konnte nicht durchgeführt werden</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">Δεν εισήχθει: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Δεν εισήχθει</string>
    <string name="exportSuccessfulTitle">Εξαγωγή επιτυχής</string>
    <string name="exportFailedTitle">Εξαγωγή ανεπιτυχής</string>
-    <string name="exportFailed">Δεν εξήχθη: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Δεν εξήχθη</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: <xliff:g>%s</xliff:g></string>
-    <string name="importFailed">Ne povis importi kartoj: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Ne povis eksporti kartoj</string>
+    <string name="importFailed">Ne povis importi kartoj</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: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">No se han podido importar tarjetas</string>
    <string name="exportSuccessfulTitle">Exportado</string>
    <string name="exportFailedTitle">Falló la exportación</string>
-    <string name="exportFailed">No se han podido exportar las tarjetas: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">No se han podido exportar las tarjetas</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ä: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Kortteja ei voitu viedä</string>
    <string name="exportFailedTitle">Vienti epäonnistui</string>
    <string name="exportSuccessfulTitle">Vienti valmis</string>
-    <string name="importFailed">Kortteja ei voitu tuoda: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Kortteja ei voitu tuoda</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\'importer les cartes: <xliff:g>%s</xliff:g></string>
+    <string name="importFailedTitle">Échec de l’import</string>
+    <string name="importFailed">Impossible d’effectuer l’importation</string>
    <string name="exportSuccessfulTitle">Exporté</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="exportFailedTitle">Échec de l’export</string>
+    <string name="exportFailed">Impossible d’effectuer l’exportation</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,9 +1,56 @@
-<resources
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
+<?xml version="1.0" encoding="utf-8"?>
+<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>
-</resources>
+    <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>
--- 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources>
    <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: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Nije moguće uvesti karte</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: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Nije moguće izvesti karte</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: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Tidak dapat mengimpor kartu</string>
    <string name="exportSuccessfulTitle">Sudah diekspor</string>
    <string name="exportFailedTitle">Ekspor gagal</string>
-    <string name="exportFailed">Tidak dapat mengekspor kartu: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Tidak dapat mengekspor kartu</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 importare le carte: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Impossibile eseguire l\'importazione</string>
    <string name="exportSuccessfulTitle">Esportato</string>
    <string name="exportFailedTitle">Esportazione fallita</string>
-    <string name="exportFailed">Impossibile esportare le carte: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Impossibile eseguire l\'esportazione</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>
@@ -221,4 +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>
-</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">カードをエクスポートできませんでした: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">カードをエクスポートできませんでした</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">カードをインポートできません: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">カードをインポートできません</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">카드를 내보낼 수 없음: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">카드를 내보낼 수 없음</string>
    <string name="importOptionApplicationExplanation">다른 파일 관리자 또는 앱을 사용하여 파일을 엽니다.</string>
    <string name="exportFailedTitle">내보내기 실패</string>
    <string name="exportSuccessfulTitle">내보내기 완료</string>
-    <string name="importFailed">카드를 가져올 수 없음: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">카드를 가져올 수 없음</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: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Kaarten konnten net exportéiert ginn</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: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Kaarten konnten net anere sproochen ginn</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ų: <xliff:g>%s</xliff:g></string>
-    <string name="exportFailed">Nepavyko eksportuoti kortelių: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Nepavyko importuoti kortelių</string>
+    <string name="exportFailed">Nepavyko eksportuoti kortelių</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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources>
    <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: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Nevarēja importēt kartes</string>
    <string name="exportSuccessfulTitle">Eksports</string>
    <string name="exportFailedTitle">Eksports neizdevās</string>
-    <string name="exportFailed">Nevarēja eksportēt kartes: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Nevarēja eksportēt kartes</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
@@ -29,10 +29,10 @@
    <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">Klarte ikke å importere kort: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Klarte ikke å importere kort</string>
    <string name="exportSuccessfulTitle">Eksportert</string>
    <string name="exportFailedTitle">Kunne ikke eksportere</string>
-    <string name="exportFailed">Kunne ikke eksportere kort: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Kunne ikke eksportere kort</string>
    <string name="importing">Importerer…</string>
    <string name="exporting">Exporterer…</string>
    <string name="noExternalStoragePermissionError">Innvilg lagringstilgang til eksternlager for å importere eller eksportere kort først</string>
--- 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: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Het importeren is mislukt</string>
    <string name="exportSuccessfulTitle">Exporteren voltooid</string>
    <string name="exportFailedTitle">Exporteren mislukt</string>
-    <string name="exportFailed">Het exporteren is mislukt: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Het exporteren is mislukt</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>
--- 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: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Exportacion pas possibla</string>
    <string name="exportSuccessfulTitle">Exportat</string>
-    <string name="importFailed">Importacion de vòstras cartas impossibla: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Importacion de vòstras cartas impossibla</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
@@ -33,10 +33,10 @@
    <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ć: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Nie udało się zaimportować</string>
    <string name="exportSuccessfulTitle">Wyeksportowano</string>
    <string name="exportFailedTitle">Eksport nie powiódł się</string>
-    <string name="exportFailed">Nie udało się wyeksportować: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Nie udało się wyeksportować</string>
    <string name="importing">Importowanie…</string>
    <string name="exporting">Eksportowanie…</string>
    <string name="noExternalStoragePermissionError">Najpierw przyznaj uprawnienia pamięci zewnętrznej do importowania lub eksportowania kart</string>
--- 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: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Não foi possível importar os cartões</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: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Não foi possível exportar os cartões</string>
    <string name="importing">A importar…</string>
    <string name="exporting">A exportar…</string>
    <string name="settings_sky_blue_theme">Azul céu</string>
--- 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: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Nu s-a putut importa carduri</string>
    <string name="noCardIdError">Nu s-a introdus niciun ID de card</string>
-    <string name="exportFailed">Nu s-a putut exporta carduri: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Nu s-a putut exporta carduri</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">Невозможно импортировать карты: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Невозможно выполнить импорт</string>
    <string name="exportSuccessfulTitle">Экспортировано</string>
    <string name="exportFailedTitle">Экспорт не выполнен</string>
-    <string name="exportFailed">Невозможно экспортировать карты: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Невозможно выполнить экспорт</string>
    <string name="importing">Импорт…</string>
    <string name="exporting">Экспорт…</string>
    <string name="noExternalStoragePermissionError">Импорт или экспорт данных невозможен без разрешения на доступ к хранилищу</string>
@@ -230,4 +230,4 @@
    <string name="action_show_details">Показать детали</string>
    <string name="translate_platform">на Weblate</string>
    <string name="shortcutSelectCard">Выбор карты</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: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Zlyhal import</string>
    <string name="exportSuccessfulTitle">Export bol úspešný</string>
    <string name="exportFailedTitle">Export zlyhal</string>
-    <string name="exportFailed">Zlyhal export: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Zlyhal export</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: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Napaka pri uvozu</string>
    <string name="exportSuccessfulTitle">Izvoz je uspel</string>
    <string name="exportFailedTitle">Izvoz ni uspel</string>
-    <string name="exportFailed">Napaka pri izvozu: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Napaka pri izvozu</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 exportera kort: <xliff:g>%s</xliff:g></string>
-    <string name="importFailed">Kunde inte importera kort: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Kunde inte genomföra export</string>
+    <string name="importFailed">Kunde inte genomföra import</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">Kartlar dışa aktarılamadı: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Dışa aktarma gerçekleştirilemedi</string>
    <string name="exportFailedTitle">Dışa aktarılamadı</string>
    <string name="exportSuccessfulTitle">Dışa aktarıldı</string>
-    <string name="importFailed">Kartlar içe aktarılamadı: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">İçe aktarma gerçekleştirilemedi</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,4 +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>
-</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">Неможливо експортувати картки: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Неможливо здійснити експорт</string>
    <string name="exportFailedTitle">Помилка експорту</string>
    <string name="exportSuccessfulTitle">Експортовано</string>
-    <string name="importFailed">Неможливо імпортувати картки: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Неможливо здійснити імпорт</string>
    <string name="importFailedTitle">Помилка імпорту</string>
    <string name="importSuccessfulTitle">Імпортовано</string>
    <string name="importExportHelp">Резервна копія даних дозволяє перемістити їх до іншого пристрою.</string>
@@ -229,4 +229,5 @@
    <string name="action_show_details">Показати деталі</string>
    <string name="action_hide_details">Сховати деталі</string>
    <string name="translate_platform">на Weblate</string>
-</resources>
+    <string name="shortcutSelectCard">Оберіть карту</string>
+</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">无法导出卡片: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">无法导出卡片</string>
    <string name="exportFailedTitle">导出失败</string>
    <string name="exportSuccessfulTitle">导出成功</string>
-    <string name="importFailed">无法导入卡片: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">无法导入卡片</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">無法匯出卡片: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">無法匯出卡片</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">無法匯入卡片: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">無法匯入卡片</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 import cards: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Could not perform import</string>
    <string name="exportSuccessfulTitle">Exported</string>
    <string name="exportFailedTitle">Export failed</string>
-    <string name="exportFailed">Could not export cards: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Could not perform export</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,9 +257,6 @@
    <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>
 </resources>
--- a/fastlane/metadata/android/en-US/changelogs/96.txt
+++ b/fastlane/metadata/android/en-US/changelogs/96.txt
@@ -1 +1,2 @@
- Add CODE 93 support
+- Add CODE 93 support
+- Various minor bugfixes and improvements
--- a/fastlane/metadata/android/tr-TR/changelogs/96.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/96.txt
@@ -1 +1,2 @@
 - CODE 93 desteği eklendi
+- Çeşitli küçük hata düzeltmeleri ve iyileştirmeler
--- a/fastlane/metadata/android/uk/title.txt
+++ b/fastlane/metadata/android/uk/title.txt
@@ -1 +1 @@
-Catima — Libre гаман для карт
+Catima — гаман для карт
Author	SHA1	Message	Date
Sylvia van Os	21216f3aa6	Release Catima 2.12.0	2021-12-23 17:41:06 +01:00
bors[bot]	808dd73221	Merge #697 697: Translations update from Hosted Weblate r=TheLastProject a=weblate Translations update from [Hosted Weblate](https://hosted.weblate.org) for [Catima/Catima](https://hosted.weblate.org/projects/catima/catima/). It also includes following components: * [Catima/Fastlane](https://hosted.weblate.org/projects/catima/fastlane/) Current translation status: ![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg) Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>	2021-12-23 16:03:57 +00:00
Oğuz Ersen	e3bd82f4a2	Translated using Weblate (Turkish) Currently translated at 28.4% (27 of 95 strings) Translation: Catima/Fastlane Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/tr/	2021-12-23 16:53:14 +01:00
Sylvia van Os	2cbb105c21	Merge pull request #696 from TheLastProject/create-pull-request/patch-1640123935 Update Fastlane changelogs	2021-12-21 23:01:58 +01:00
TheLastProject	40c364a5e8	Update Fastlane changelogs	2021-12-21 21:58:54 +00:00
Sylvia van Os	8c484078b4	Mention various small fixes	2021-12-21 22:58:33 +01:00
bors[bot]	f93f3b912d	Merge #695 695: Translations update from Hosted Weblate r=TheLastProject a=weblate Translations update from [Hosted Weblate](https://hosted.weblate.org) for [Catima/Catima](https://hosted.weblate.org/projects/catima/catima/). It also includes following components: * [Catima/Fastlane](https://hosted.weblate.org/projects/catima/fastlane/) Current translation status: ![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg) Co-authored-by: Yevgeny M <yevgenym.lg3@gmail.com> Co-authored-by: IllusiveMan196 <hamsterrv@gmail.com> Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>	2021-12-20 17:09:03 +00:00
Sylvia van Os	934ef22a8c	Translated using Weblate (Hebrew (Israel)) Currently translated at 33.7% (79 of 234 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/he_IL/	2021-12-20 12:51:14 +01:00
IllusiveMan196	732679f3f8	Translated using Weblate (Ukrainian) Currently translated at 14.7% (14 of 95 strings) Translation: Catima/Fastlane Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/uk/	2021-12-19 08:33:17 +01:00
IllusiveMan196	2e7cbcbac9	Translated using Weblate (Ukrainian) Currently translated at 100.0% (234 of 234 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/uk/	2021-12-19 08:33:17 +01:00
Yevgeny M	eb5161a382	Translated using Weblate (Hebrew (Israel)) Currently translated at 34.1% (80 of 234 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/he_IL/	2021-12-19 08:33:16 +01:00
bors[bot]	b765d77145	Merge #693 693: Update contributors r=TheLastProject a=github-actions[bot] Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action Co-authored-by: TheLastProject <TheLastProject@users.noreply.github.com>	2021-12-19 07:28:43 +00:00
TheLastProject	ad344c7d12	Update contributors	2021-12-19 05:16:53 +00:00