From 8ff37e953fafb05aed9908c4b743da259ed0912d Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <msfjarvis@gmail.com>
Date: Wed, 17 Jun 2020 18:35:46 +0530
Subject: Improve bulk deletion and password move flow (#855)

Co-authored-by: Fabian Henneke <FabianHenneke@users.noreply.github.com>
---
 app/src/main/res/values-ar/strings.xml     | 1 -
 app/src/main/res/values-cs/strings.xml     | 1 -
 app/src/main/res/values-de/strings.xml     | 1 -
 app/src/main/res/values-es/strings.xml     | 1 -
 app/src/main/res/values-fr/strings.xml     | 1 -
 app/src/main/res/values-ja/strings.xml     | 1 -
 app/src/main/res/values-ru/strings.xml     | 1 -
 app/src/main/res/values-zh-rCN/strings.xml | 1 -
 app/src/main/res/values-zh-rTW/strings.xml | 1 -
 app/src/main/res/values/strings.xml        | 8 +++++++-
 10 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index c76b435c..8b87028d 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -10,7 +10,6 @@
     <string name="dialog_delete">حذف المجلد</string>
     <string name="dialog_do_not_delete">إلغاء</string>
     <string name="title_activity_git_clone">معلومات حول المستودع</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 24a1913d..e6c69ab3 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -13,7 +13,6 @@
     <string name="title_activity_git_clone">Informace repozitáře</string>
     <!-- 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="delete_dialog_text">Opravdu chcete smazat heslo %1$s?</string>
     <string name="move">Přesunout</string>
     <string name="edit">Editovat</string>
     <string name="delete">Smazat</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index aae2e888..257d45ca 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -13,7 +13,6 @@
     <string name="title_activity_git_clone">Repository Informationen</string>
     <!-- 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="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 7a8309bb..558b7a26 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -13,7 +13,6 @@
     <string name="title_activity_git_clone">Información de repositorio</string>
     <!-- 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="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 945e3559..76edb963 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -13,7 +13,6 @@
     <string name="title_activity_git_clone">Information sur le dépôt Git</string>
     <!-- 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="delete_dialog_text">Êtes-vous sûr de vouloir supprimer le mot de passe %1$s?</string>
     <string name="move">Déplacer</string>
     <string name="edit">Éditer</string>
     <string name="delete">Supprimer</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 8bdec1e7..02dd3219 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -13,7 +13,6 @@
     <string name="title_activity_git_clone">リポジトリ情報</string>
     <!-- Password Store -->
     <string name="creation_dialog_text">パスワードや同期操作を追加する前に、以下の新しいリポジトリをクローンまたは作成してください。</string>
-    <string name="delete_dialog_text">パスワードを削除してもよろしいですか %1$s</string>
     <string name="delete">削除</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 836b5672..99217355 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -13,7 +13,6 @@
     <string name="title_activity_git_clone">Информация о репозитории</string>
     <!-- Password Store -->
     <string name="creation_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 ff3ad60a..34ef46a1 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -13,7 +13,6 @@
     <string name="title_activity_git_clone">Repo 信息</string>
     <!-- Password Store -->
     <string name="creation_dialog_text">在尝试添加密码或任何同步操作前请在下方克隆或添加一个新的 Repo</string>
-    <string name="delete_dialog_text">你确定要删除密码 %1$s</string>
     <string name="delete">删除</string>
     <!-- git commits -->
     <string name="git_commit_add_text">使用Android Password Store来添加 %1$s</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index cb35d387..b38380b4 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -13,7 +13,6 @@
     <string name="title_activity_git_clone">Repo 訊息</string>
     <!-- Password Store -->
     <string name="creation_dialog_text">在嘗試新增密碼或任何同步操作之前請在下方 clone 或新增一個新的 Repo</string>
-    <string name="delete_dialog_text">你確定要刪除密碼 %1$s</string>
     <string name="delete">刪除</string>
     <!-- PGPHandler -->
     <string name="provider_toast_text">未選擇提供 OpenPGP 的 app</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db508815..1583b888 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,7 +24,10 @@
     <!-- Password Store -->
     <string name="creation_dialog_text">Please clone or create a new repository below before trying to add a password or running any synchronization operation.</string>
     <string name="key_dialog_text">A valid PGP key must be selected in Settings before initializing the repository</string>
-    <string name="delete_dialog_text">Are you sure you want to delete the password %1$s?</string>
+    <plurals name="delete_dialog_text">
+        <item quantity="one">Are you sure you want to delete the password?</item>
+        <item quantity="other">Are you sure you want to delete %d passwords?</item>
+    </plurals>
     <string name="move">Move</string>
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
@@ -36,12 +39,15 @@
     <string name="no_key_selected_dialog_text">We will redirect you to settings. Please select your OpenPGP Key.</string>
     <string name="password_exists_title">Password already exists!</string>
     <string name="password_exists_message">This will overwrite %1$s with %2$s.</string>
+    <string name="password_move_error_title">Error while moving passwords</string>
+    <string name="password_move_error_message">Failed to move %1$s to %2$s</string>
 
     <!-- git commits -->
     <string name="git_commit_add_text">Add generated password for %1$s using Android Password Store.</string>
     <string name="git_commit_edit_text">Edit password for %1$s using Android Password Store.</string>
     <string name="git_commit_remove_text">Remove %1$s from store.</string>
     <string name="git_commit_move_text">Rename %1$s to %2$s.</string>
+    <string name="git_commit_move_multiple_text">Move multiple passwords to %1$s.</string>
 
     <!-- PGPHandler -->
     <string name="provider_toast_text">No OpenPGP provider selected!</string>
-- 
cgit v1.2.3