From 81aff5d870af5da4b16cc5ed455106dd58aefd54 Mon Sep 17 00:00:00 2001
From: حسين <zidhussein@gmail.com>
Date: Tue, 25 Dec 2018 14:39:32 +0000
Subject: Commit messages (#455)

* use full password path in add/edit git commit message

* commit strings are format strings

* use format strings in other languages

* use move/rename commit message
---
 app/src/main/res/values-ar/strings.xml     | 2 +-
 app/src/main/res/values-cs/strings.xml     | 3 ---
 app/src/main/res/values-de/strings.xml     | 3 ---
 app/src/main/res/values-fr/strings.xml     | 5 ++---
 app/src/main/res/values-ja/strings.xml     | 5 ++---
 app/src/main/res/values-ru/strings.xml     | 5 ++---
 app/src/main/res/values-zh-rCN/strings.xml | 5 ++---
 app/src/main/res/values-zh-rTW/strings.xml | 3 ---
 app/src/main/res/values/strings.xml        | 9 +++++----
 9 files changed, 14 insertions(+), 26 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 5b863e6d..95c95f7f 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -15,7 +15,7 @@
     <string name="edit">تعديل</string>
     <string name="delete">حذف</string>
 
-    <string name="from_store">&#160; مِن المخزن.</string>
+    <!-- git commits -->
 
     <!-- PGPHandler -->
     <string name="provider_toast_text">لم يتم إختيار مزود الأوبن بي جي بي بعد !</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index a8bb0a50..407b6367 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -18,9 +18,6 @@
     <string name="delete_dialog_text">Opravdu chcete smazat heslo /"</string>
 
     <!-- git commits -->
-    <string name="add_commit_text">[ANDROID PwdStore] Add &#160;</string>
-    <string name="edit_commit_text">[ANDROID PwdStore] Edit &#160;</string>
-    <string name="from_store">&#160; from store.</string>
 
     <!-- PGPHandler -->
     <string name="provider_toast_text">Nebyl vybrán poskytovatel OpenPGP!</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8c63a37b..bfa35daf 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -21,8 +21,6 @@
     <string name="delete">Löschen</string>
 
     <!-- git commits -->
-    <string name="add_commit_text">[ANDROID PwdStore] Add &#160;</string>
-    <string name="from_store">&#160; from store.</string>
 
     <!-- PGPHandler -->
     <string name="provider_toast_text">Kein OpenPGP-Provider ausgewählt!</string>
@@ -170,7 +168,6 @@
     <string name="show_extra_content_pref_summary">Soll weiterer Inhalt sichtbar sein?</string>
     <string name="pwd_generate_button">Generieren</string>
     <string name="no_repo_selected">Kein externes Repository ausgewählt</string>
-    <string name="edit_commit_text">[ANDROID PwdStore] Edit &#160;</string>
     <string name="send_plaintext_password_to">Passwort senden als Nur-Text mit behilfe von…</string>
     <string name="show_password">Password wiedergeben</string>
     <string name="repository_uri">Repository URI</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 0f4b427d..a3905ced 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -18,9 +18,8 @@
     <string name="delete_dialog_text">Êtes-vous sûr de vouloir supprimer le mot de passe /"</string>
 
     <!-- git commits -->
-    <string name="add_commit_text">[ANDROID PwdStore] Ajouter &#160;</string>
-    <string name="edit_commit_text">[ANDROID PwdStore] Editer &#160;</string>
-    <string name="from_store">&#160; depuis le dépôt.</string>
+    <string name="git_commit_add_text">Ajouter %1$s depuis le dépôt.</string>
+    <string name="git_commit_edit_text">Editer %1$s depuis le dépôt.</string>
 
     <!-- PGPHandler -->
     <string name="provider_toast_text">Aucun prestataire OpenPGP sélectionné !</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 051d7edf..ca1c08da 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -18,9 +18,8 @@
     <string name="delete_dialog_text">パスワードを削除してもよろしいですか /"</string>
 
     <!-- git commits -->
-    <string name="add_commit_text">[ANDROID PwdStore] 追加 &#160;</string>
-    <string name="edit_commit_text">[ANDROID PwdStore] 編集 &#160;</string>
-    <string name="from_store">&#160; ストアから。</string>
+    <string name="git_commit_add_text">追加 %1$s ストアから。</string>
+    <string name="git_commit_edit_text">編集 %1$s ストアから。</string>
 
     <!-- PGPHandler -->
     <string name="provider_toast_text">OpenPGP プロバイダが選択されていません!</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d8177901..6863d800 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -21,9 +21,8 @@
     <string name="delete">Удалить</string>
 
     <!-- git commits -->
-    <string name="add_commit_text">[ANDROID PwdStore] Добавлен пароль &#160;</string>
-    <string name="edit_commit_text">[ANDROID PwdStore] Отредактирован пароль &#160;</string>
-    <string name="from_store">&#160; из хранилища.</string>
+    <string name="git_commit_add_text">Добавлен пароль %1$s из хранилища.</string>
+    <string name="git_commit_edit_text">Отредактирован %1$s из хранилища.</string>
 
     <!-- PGPHandler -->
     <string name="provider_toast_text">Не выбран провайдер OpenPGP!</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6854271d..e0b2a54d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -3,7 +3,6 @@
     <string name="app_name">Password Store</string>
     <string name="action_search">搜索</string>
     <string name="action_settings">设置</string>
-    <string name="add_commit_text">[ANDROID PwdStore] 添加 &#160;</string>
     <string name="autofill_apps_default">使用默认设置</string>
     <string name="autofill_apps_delete">删除</string>
     <string name="autofill_apps_first">自动匹配</string>
@@ -30,11 +29,11 @@
     <string name="dialog_ok">确定</string>
     <string name="dialog_oops">糟糕…</string>
     <string name="dialog_yes">确定</string>
-    <string name="edit_commit_text">[ANDROID PwdStore] 修改 &#160;</string>
     <string name="empty_toast_text">无法使用空白密码或者空白的额外内容</string>
     <string name="file_toast_text">请提供一个文件名</string>
     <string name="forget_username_dialog_text">你忘了提供用户名了吗？</string>
-    <string name="from_store">&#160; 从商店</string>
+    <string name="git_commit_edit_text">修改 %1$s 从商店</string>
+    <string name="git_commit_add_text">添加 %1$s 从商店</string>
     <string name="git_pull">Git Pull</string>
     <string name="git_push">Git Push</string>
     <string name="git_sync">同步 Repo</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index d0970f00..3a9fca05 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -3,7 +3,6 @@
     <string name="app_name">Password Store</string>
     <string name="action_search">搜尋</string>
     <string name="action_settings">設定</string>
-    <string name="add_commit_text">[ANDROID PwdStore] Add &#160;</string>
     <string name="autofill_apps_default">使用預設值</string>
     <string name="autofill_apps_delete">刪除</string>
     <string name="autofill_apps_first">自動選取</string>
@@ -30,11 +29,9 @@
     <string name="dialog_ok">確定</string>
     <string name="dialog_oops">糟糕…</string>
     <string name="dialog_yes">確定</string>
-    <string name="edit_commit_text">[ANDROID PwdStore] Modify &#160;</string>
     <string name="empty_toast_text">不能使用空白密碼或者空白的備註</string>
     <string name="file_toast_text">請填寫文件名稱</string>
     <string name="forget_username_dialog_text">你忘記輸入使用者名稱了嗎？</string>
-    <string name="from_store">&#160; 從商店</string>
     <string name="git_pull">Git Pull</string>
     <string name="git_push">Git Push</string>
     <string name="git_sync">同步 Repo</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 247275a1..a5506aa7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -22,10 +22,11 @@
     <string name="delete">Delete</string>
 
     <!-- git commits -->
-    <string name="add_commit_text">[ANDROID PwdStore] Add &#160;</string>
-    <string name="edit_commit_text">"[ANDROID PwdStore] Edit "</string>
-    <string name="increment_commit_text">"[ANDROID PwdStore] Increment HOTP counter for "</string>
-    <string name="from_store">&#160; from store.</string>
+    <string name="git_commit_add_text">Add password for %1$s using android password store.</string>
+    <string name="git_commit_edit_text">"Edit %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_increment_text">"Increment HOTP counter for %1$s."</string>
 
     <!-- PGPHandler -->
     <string name="provider_toast_text">No OpenPGP Provider selected!</string>
-- 
cgit v1.2.3