improve translations with format strings

delete dialog format string

dialog text format

12 files changed, 24 insertions, 25 deletions

diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
index 123acd2d..8a5acec8 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
@@ -536,10 +536,9 @@ public class PasswordStore extends AppCompatActivity {
         }
         final int position = (int) it.next();
         final PasswordItem item = adapter.getValues().get(position);
-        new AlertDialog.Builder(this).
-                setMessage(this.getResources().getString(R.string.delete_dialog_text) +
-                        item + "\"")
-                .setPositiveButton(this.getResources().getString(R.string.dialog_yes), (dialogInterface, i) -> {
+        new AlertDialog.Builder(this)
+                .setMessage(getResources().getString(R.string.delete_dialog_text, item.getLongName()))
+                .setPositiveButton(getResources().getString(R.string.dialog_yes), (dialogInterface, i) -> {
                     item.getFile().delete();
                     adapter.remove(position);
                     it.remove();
diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt b/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt
index d93d6bcc..2f36c965 100644
--- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt
@@ -108,7 +108,7 @@ class UserPreference : AppCompatActivity() {
                 val repoDir = PasswordRepository.getRepositoryDirectory(callingActivity.applicationContext)
                 AlertDialog.Builder(callingActivity)
                     .setTitle(R.string.pref_dialog_delete_title)
-                    .setMessage("${resources.getString(R.string.dialog_delete_msg)} \n $repoDir")
+                    .setMessage(resources.getString(R.string.dialog_delete_msg, repoDir))
                     .setCancelable(false)
                     .setPositiveButton(R.string.dialog_delete) { dialogInterface, _ ->
                         try {
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 661ac502..3ac92731 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -8,7 +8,7 @@
     <string name="dialog_delete">حذف المجلد</string>
     <string name="dialog_do_not_delete">إلغاء</string>
     <string name="title_activity_git_clone">معلومات حول المستودع</string>
-    <string name="delete_dialog_text">هل تود حقًا حذف كلمة السر "/</string>
+    <string name="delete_dialog_text">هل تود حقًا حذف كلمة السر %1$s ؟</string>
     <string name="move">نقل</string>
     <string name="edit">تعديل</string>
     <string name="delete">حذف</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 72795318..04504ee4 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -5,7 +5,7 @@
 
     <string name="action_settings">Nastavení</string>
     <string name="dialog_delete_title">Adresář již existuje</string>
-    <string name="dialog_delete_msg">Cílový adresář již existuje. Aktuální verze podporuje pouze jedno úložiště. Opravdu smazat aktuální adresář úložiště hesel:</string>
+    <string name="dialog_delete_msg">Cílový adresář již existuje. Aktuální verze podporuje pouze jedno úložiště. Opravdu smazat aktuální adresář úložiště hesel\n(%1$s)</string>
     <string name="dialog_delete">Smazat adresář</string>
     <string name="dialog_do_not_delete">Zrušit</string>
     <string name="title_activity_git_clone">Informace repozitáře</string>
@@ -13,7 +13,7 @@
     <!-- Password Store -->
     <string name="creation_dialog_text">Naklonujte nebo vytvořte nový repozitář před pokusem přidat heslo nebo spustit synchronizaci.</string>
     <string name="key_dialog_text">Před inicializací repozitáře je třeba vybrat "ID PGP klíče"</string>
-    <string name="delete_dialog_text">Opravdu chcete smazat heslo /"</string>
+    <string name="delete_dialog_text">Opravdu chcete smazat heslo %1$s</string>
 
     <!-- git commits -->
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c474d86f..99358f5a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -5,7 +5,7 @@
 
     <string name="action_settings">Einstellungen</string>
     <string name="dialog_delete_title">Ordner existiert bereits</string>
-    <string name="dialog_delete_msg">Zielordner existiert bereits. Aktuelle Version unterstützt nur eine einzige Datenquelle. Möchtest du die aktuelle Datenquelle löschen:</string>
+    <string name="dialog_delete_msg">Zielordner existiert bereits. Aktuelle Version unterstützt nur eine einzige Datenquelle. Möchtest du die aktuelle Datenquelle löschen?\n(%1$s)</string>
     <string name="dialog_delete">Ordner löschen</string>
     <string name="dialog_do_not_delete">Abbruch</string>
     <string name="title_activity_git_clone">Repository Informationen</string>
@@ -13,7 +13,7 @@
     <!-- Password Store -->
     <string name="creation_dialog_text">Bitte klone oder erstelle ein neues Repository, bevor du versuchst ein Passwort hinzuzufügen oder jegliche Synchronisation-Operation durchführst.</string>
     <string name="key_dialog_text">Du musst deine PGP-Key ID auwählen, bevor das Repository intialisiert wird.</string>
-    <string name="delete_dialog_text">Bist du dir sicher, dass du das Passwort löschen möchtest \"</string>
+    <string name="delete_dialog_text">Bist du dir sicher, dass du das Passwort löschen möchtest %1$s?</string>
     <string name="move">Verschieben</string>
     <string name="edit">Bearbeiten</string>
     <string name="delete">Löschen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 4bbb6d66..1131616d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -5,7 +5,7 @@
 
     <string name="action_settings">Ajustes</string>
     <string name="dialog_delete_title">El directorio ya existe</string>
-    <string name="dialog_delete_msg">El directorio seleccionado ya existe. La versión actual solo soporta un almacén de contraseñas. ¿Quieres eliminar el almacén actual?</string>
+    <string name="dialog_delete_msg">El directorio seleccionado ya existe. La versión actual solo soporta un almacén de contraseñas. ¿Quieres eliminar el almacén actual?\n(%1$s)</string>
     <string name="dialog_delete">Eliminar directorio</string>
     <string name="dialog_do_not_delete">Cancelar</string>
     <string name="title_activity_git_clone">Información de repositorio</string>
@@ -13,7 +13,7 @@
     <!-- Password Store -->
     <string name="creation_dialog_text">Por favor clona o crea un nuevo repositorio antes de añadir una contraseña o ejecutar una operación de sincronización.</string>
     <string name="key_dialog_text">Tienes que seleccionar una llave PGP antes de inicializar el repositorio</string>
-    <string name="delete_dialog_text">Confirma que deseas eliminar la contraseña /"</string>
+    <string name="delete_dialog_text">Confirma que deseas eliminar la contraseña %1$s</string>
     <string name="move">Mover</string>
     <string name="edit">Editar</string>
     <string name="delete">Eliminar</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index dfb9b831..a45a90a8 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -5,7 +5,7 @@
 
     <string name="action_settings">Paramètres</string>
     <string name="dialog_delete_title">Répertoire déjà existant</string>
-    <string name="dialog_delete_msg">Répertoire cible déjà existant. La version actuelle ne supporte qu\'un seul gestionnaire. Voulez vous supprimer le répertoire actual du gestionnaire de mots de passe:</string>
+    <string name="dialog_delete_msg">Répertoire cible déjà existant. La version actuelle ne supporte qu\'un seul gestionnaire. Voulez vous supprimer le répertoire actual du gestionnaire de mots de passe?\n(%1$s)</string>
     <string name="dialog_delete">Suprimer le répertoire</string>
     <string name="dialog_do_not_delete">Annuler</string>
     <string name="title_activity_git_clone">Information sur le dépôt Git</string>
@@ -13,7 +13,7 @@
     <!-- Password Store -->
     <string name="creation_dialog_text">Clonez ou créez un dépôt suivant avant d\'essayer d\'ajouter un mot de pass ou d\'effectuer une opération de synchornisation.</string>
     <string name="key_dialog_text">Vous devez sélectionner votre "PGP-Key ID" avant d\'initialiser le dépôt</string>
-    <string name="delete_dialog_text">Êtes-vous sûr de vouloir supprimer le mot de passe /"</string>
+    <string name="delete_dialog_text">Êtes-vous sûr de vouloir supprimer le mot de passe %1$s?</string>
 
     <!-- git commits -->
     <string name="git_commit_add_text">Ajouter %1$s depuis le dépôt.</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index cb7b249f..43db9352 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -5,7 +5,7 @@
 
     <string name="action_settings">設定</string>
     <string name="dialog_delete_title">ディレクトリーはすでに存在します</string>
-    <string name="dialog_delete_msg">対象のディレクトリーはすでに存在します。 現在のバージョンは1つのストアのみをサポートしています。 現在のパスワードストアのディレクトリーを削除しますか:</string>
+    <string name="dialog_delete_msg">対象のディレクトリーはすでに存在します。 現在のバージョンは1つのストアのみをサポートしています。 現在のパスワードストアのディレクトリーを削除しますか\n(%1$s)</string>
     <string name="dialog_delete">ディレクトリーを削除</string>
     <string name="dialog_do_not_delete">キャンセル</string>
     <string name="title_activity_git_clone">リポジトリ情報</string>
@@ -13,7 +13,7 @@
     <!-- Password Store -->
     <string name="creation_dialog_text">パスワードや同期操作を追加する前に、以下の新しいリポジトリをクローンまたは作成してください。</string>
     <string name="key_dialog_text">リポジトリを初期化する前に "PGP 鍵 ID"を選択する必要があります</string>
-    <string name="delete_dialog_text">パスワードを削除してもよろしいですか /"</string>
+    <string name="delete_dialog_text">パスワードを削除してもよろしいですか %1$s</string>
 
     <!-- git commits -->
     <string name="git_commit_add_text">追加 %1$s ストアから。</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index da8b8e54..b21824a6 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -5,7 +5,7 @@
 
     <string name="action_settings">Настройки</string>
     <string name="dialog_delete_title">Директория уже существует</string>
-    <string name="dialog_delete_msg">Директория уже существует. Текущая версия поддерживает только одно хранилище. Хотите удалить существующую директорию:</string>
+    <string name="dialog_delete_msg">Директория уже существует. Текущая версия поддерживает только одно хранилище. Хотите удалить существующую директорию\n(%1$s)</string>
     <string name="dialog_delete">Удалить директорию</string>
     <string name="dialog_do_not_delete">Отменить</string>
     <string name="title_activity_git_clone">Информация о репозитории</string>
@@ -13,7 +13,7 @@
     <!-- Password Store -->
     <string name="creation_dialog_text">Пожалуйста, клонируйте или создайте новый репозиторий перед тем, как добавлять пароль или выполнять синхронизацию.</string>
     <string name="key_dialog_text">Вы должны выбрать PGP ключ перед инициализацией хранилища</string>
-    <string name="delete_dialog_text">Вы уверены что хотите удалить пароль /"</string>
+    <string name="delete_dialog_text">Вы уверены что хотите удалить пароль %1$s</string>
     <string name="move">Переместить</string>
     <string name="edit">Редактировать</string>
     <string name="delete">Удалить</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index fb3f324f..d309ba50 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -17,10 +17,10 @@
     <string name="crypto_pass_label">密码</string>
     <string name="crypto_extra_label">备注</string>
     <string name="crypto_name_hint">名称</string>
-    <string name="delete_dialog_text">你确定要删除密码 /\"</string>
+    <string name="delete_dialog_text">你确定要删除密码 %1$s</string>
     <string name="dialog_cancel">取消</string>
     <string name="dialog_delete">删除目录</string>
-    <string name="dialog_delete_msg">目标目录已存在. 当前版本仅支持单一储存. 真的要删除当前Password Store目录吗:</string>
+    <string name="dialog_delete_msg">目标目录已存在. 当前版本仅支持单一储存. 真的要删除当前Password Store目录吗\n(%1$s)</string>
     <string name="dialog_delete_title">目录已存在</string>
     <string name="dialog_do_not_delete">取消</string>
     <string name="dialog_negative">呃… 算了吧</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 0dda8592..f8c01e48 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -17,10 +17,10 @@
     <string name="crypto_pass_label">密碼</string>
     <string name="crypto_extra_label">備註</string>
     <string name="crypto_name_hint">名稱</string>
-    <string name="delete_dialog_text">你確定要刪除密碼 /\"</string>
+    <string name="delete_dialog_text">你確定要刪除密碼 %1$s</string>
     <string name="dialog_cancel">取消</string>
     <string name="dialog_delete">刪除目錄</string>
-    <string name="dialog_delete_msg">目標目錄已存在. 目前版本僅支援單一儲存區. 真的要刪除現有的 Password Store 目錄嗎:</string>
+    <string name="dialog_delete_msg">目標目錄已存在. 目前版本僅支援單一儲存區. 真的要刪除現有的 Password Store 目錄嗎\n(%1$s)</string>
     <string name="dialog_delete_title">目錄已存在</string>
     <string name="dialog_do_not_delete">取消</string>
     <string name="dialog_negative">呃… 算了吧</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c43ee704..ddcb5da4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,8 +5,8 @@
     <string name="app_name" translatable="false">Password Store</string>
 
     <string name="action_settings">Settings</string>
-    <string name="dialog_delete_title">Directory already exist</string>
-    <string name="dialog_delete_msg">Target directory already exist. Current version support only a single store. Do you want to delete the current password store directory:</string>
+    <string name="dialog_delete_title">Directory already exists</string>
+    <string name="dialog_delete_msg">Target directory already exists. Current version only supports a single store. Do you want to delete the current password store directory?\n(%1$s)</string>
     <string name="dialog_delete">Delete directory</string>
     <string name="dialog_do_not_delete">Cancel</string>
     <string name="title_activity_git_clone">Repository information</string>
@@ -15,7 +15,7 @@
     <!-- Password Store -->
     <string name="creation_dialog_text">Please clone or create a new repository below before trying to add a password or any synchronization operation.</string>
     <string name="key_dialog_text">You have to select your "PGP-Key ID" before initializing the repository</string>
-    <string name="delete_dialog_text">Are you sure you want to delete the password /"</string>
+    <string name="delete_dialog_text">Are you sure you want to delete the password %1$s?</string>
     <string name="move">Move</string>
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>