From 8e6ab25572571080eae228599af069f78b5ea750 Mon Sep 17 00:00:00 2001
From: Felix Bechstein <f@ub0r.de>
Date: Sun, 16 Jul 2017 16:38:30 +0200
Subject: [PATCH] externalize strings (#316)

---
 .../pwdstore/autofill/AutofillService.java      |  4 ++--
 .../com/zeapo/pwdstore/crypto/PgpHandler.java   | 10 ++++------
 app/src/main/res/layout/decrypt_layout.xml      |  4 ++--
 app/src/main/res/values-cs/strings.xml          | 13 ++++++-------
 app/src/main/res/values-de/strings.xml          |  7 +++++--
 app/src/main/res/values-fr/strings.xml          | 13 ++++++-------
 app/src/main/res/values-ja/strings.xml          | 13 ++++++-------
 app/src/main/res/values-ru/strings.xml          | 17 ++++++++---------
 app/src/main/res/values-zh-rCH/strings.xml      | 15 +++++++--------
 app/src/main/res/values-zh-rTW/strings.xml      | 15 +++++++--------
 app/src/main/res/values/strings.xml             | 17 ++++++++++-------
 11 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
index 21627038..447f39f3 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
@@ -401,8 +401,8 @@ public class AutofillService extends AccessibilityService {
         for (int i = 0; i < items.size(); i++) {
             itemNames[i] = items.get(i).getName().replace(".gpg", "");
         }
-        itemNames[items.size()] = "Pick...";
-        itemNames[items.size() + 1] = "Pick and match...";
+        itemNames[items.size()] = getString(R.string.autofill_pick);
+        itemNames[items.size() + 1] = getString(R.string.autofill_pick_and_match);
         builder.setItems(itemNames, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
index 3b027830..683c2561 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -255,15 +255,13 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
         ClipData clip = ClipData.newPlainText("pgp_handler_result_pm", decodedPassword);
         clipboard.setPrimaryClip(clip);
 
+        int clearAfter = 45;
         try {
-            showToast(this.getResources().getString(R.string.clipboard_beginning_toast_text)
-                    + " " + Integer.parseInt(settings.getString("general_show_time", "45")) + " "
-                    + this.getResources().getString(R.string.clipboard_ending_toast_text));
+            clearAfter = Integer.parseInt(settings.getString("general_show_time", "45"));
         } catch (NumberFormatException e) {
-            showToast(this.getResources().getString(R.string.clipboard_beginning_toast_text)
-                    + " 45 "
-                    + this.getResources().getString(R.string.clipboard_ending_toast_text));
+            // ignore and keep default
         }
+        showToast(this.getResources().getString(R.string.clipboard_toast_text, clearAfter));
     }
 
     public void handleClick(View view) {
diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index 7d5d9408..e04e8ea2 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -66,7 +66,7 @@
                     android:layout_height="wrap_content"
                     android:textStyle="bold"
                     android:textColor="@android:color/black"
-                    android:text="Password: "
+                    android:text="@string/password"
                     android:layout_row="0"
                     android:layout_column="0"/>
                 <TextView
@@ -111,7 +111,7 @@
                     android:layout_height="wrap_content"
                     android:textStyle="bold"
                     android:textColor="@android:color/black"
-                    android:text="Extra content: "/>
+                    android:text="@string/extra_content"/>
                 <TextView
                     android:id="@+id/crypto_extra_show"
                     android:textIsSelectable="true"
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 81ed968c..3b53ed1e 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -30,9 +30,8 @@
 
     <!-- PGPHandler -->
     <string name="provider_toast_text">Nebyl vybrán poskytovatel OpenPGP!</string>
-    <string name="okc_progress_text">Čekání na OpenKeychain...</string>
-    <string name="clipboard_beginning_toast_text">Heslo zkopírováno do schránky, máte</string>
-    <string name="clipboard_ending_toast_text">sekund na jeho zkopírování.</string>
+    <string name="okc_progress_text">Čekání na OpenKeychain…</string>
+    <string name="clipboard_toast_text">Heslo zkopírováno do schránky, máte %d sekund na jeho zkopírování.</string>
     <string name="name_settings_toast_text">Až to bude možné, tak si zadejte jméno účtu v nastavení</string>
     <string name="account_settings_dialog_text">Zadejte si v nastavení svůj OpenKeychain účet (email)</string>
     <string name="account_settings_dialog_title">Jméno účtu je prázdné!</string>
@@ -40,7 +39,7 @@
     <string name="empty_toast_text">Nelze zadat prázdné heslo nebo další obsah</string>
 
     <!-- Git Async Task -->
-    <string name="running_dialog_text">Příkaz běží...</string>
+    <string name="running_dialog_text">Příkaz běží…</string>
     <string name="jgit_error_dialog_title">Došlo k vnitřní výjimce</string>
     <string name="jgit_error_dialog_text">Zpráva od jgit: \n</string>
 
@@ -155,9 +154,9 @@
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">Ano</string>
     <string name="dialog_no">Ne</string>
-    <string name="dialog_positive">Je na cestě...</string>
-    <string name="dialog_negative">Ne... později</string>
-    <string name="dialog_oops">Ajaj...</string>
+    <string name="dialog_positive">Je na cestě…</string>
+    <string name="dialog_negative">Ne… později</string>
+    <string name="dialog_oops">Ajaj…</string>
     <string name="dialog_cancel">Zrušit</string>
     <string name="git_sync">Synchronizovat repozitář</string>
     <string name="git_pull">Stáhnout ze serveru</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a726b1b7..561c9307 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -30,8 +30,7 @@
     <!-- PGPHandler -->
     <string name="provider_toast_text">Kein OpenPGP-Provider ausgewählt!</string>
     <string name="okc_progress_text">Warte auf OpenKeychain…</string>
-    <string name="clipboard_beginning_toast_text">Passwort ist in der Zwischen ablage, du hast </string>
-    <string name="clipboard_ending_toast_text"> Sekunden, um es einzufügen.</string>
+    <string name="clipboard_toast_text">Passwort ist in der Zwischen ablage, du hast %d Sekunden, um es einzufügen.</string>
     <string name="name_settings_toast_text">Bitte setze deinen Accountnamen in den Einstellungen.</string>
     <string name="account_settings_dialog_text">Bitte setze deinen OpenKeychain Account (E-Mail) in den Einstellungen</string>
     <string name="account_settings_dialog_title">Accountname ist leer!</string>
@@ -87,6 +86,8 @@
     <!-- DECRYPT Layout -->
     <string name="crypto_category">Kategorie</string>
     <string name="action_search">Suche</string>
+    <string name="password">Passwort:</string>
+    <string name="extra_content">Weiterer Inhalt:</string>
 
     <!-- Preferences -->
     <string name="pref_git_title">Git</string>
@@ -183,6 +184,8 @@
     <string name="autofill_apps_match">Abgleichen mit</string>
     <string name="autofill_apps_never">Niemals abgleichen</string>
     <string name="autofill_apps_delete">Löschen</string>
+    <string name="autofill_pick">Auswählen…</string>
+    <string name="autofill_pick_and_match">Auswählen und merken…</string>
     <string name="no_repo_selected">Kein externes Repository ausgewählt</string>
     <string name="no_repo_selected2">Kein externes Repository ausgewählt</string>
     <string name="edit_commit_text">[ANDROID PwdStore] Edit &#160;</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8bcb8cca..6fd7ab11 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -30,9 +30,8 @@
 
     <!-- PGPHandler -->
     <string name="provider_toast_text">Aucun prestataire OpenPGP sélectionné!</string>
-    <string name="okc_progress_text">Attente de OpenKeychain...</string>
-    <string name="clipboard_beginning_toast_text">Mot de passe copié dans le presse papier, vous avez </string>
-    <string name="clipboard_ending_toast_text"> secondes pour coller celui-ci.</string>
+    <string name="okc_progress_text">Attente de OpenKeychain…</string>
+    <string name="clipboard_toast_text">Mot de passe copié dans le presse papier, vous avez %d secondes pour coller celui-ci.</string>
     <string name="name_settings_toast_text">Renseignez le nom de votre compte dans les paramètres dès que vous pouvez</string>
     <string name="account_settings_dialog_text">Renseignez votre compte OpenKeychain (email) dans les préférences</string>
     <string name="account_settings_dialog_title">Nom du compte absent!</string>
@@ -40,7 +39,7 @@
     <string name="empty_toast_text">Vous ne pouvez pas utiliser un mot de passe vide ou des données supplémentaires vide</string>
 
     <!-- Git Async Task -->
-    <string name="running_dialog_text">Commande en cours...</string>
+    <string name="running_dialog_text">Commande en cours…</string>
     <string name="jgit_error_dialog_title">Une erreur c\'est produite lors d\'une opération Git</string>
     <string name="jgit_error_dialog_text">Message de jgit: \n</string>
 
@@ -159,9 +158,9 @@
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">Oui</string>
     <string name="dialog_no">Non</string>
-    <string name="dialog_positive">En chemin...</string>
-    <string name="dialog_negative">Non... plus tard</string>
-    <string name="dialog_oops">Oups...</string>
+    <string name="dialog_positive">En chemin…</string>
+    <string name="dialog_negative">Non… plus tard</string>
+    <string name="dialog_oops">Oups…</string>
     <string name="dialog_cancel">Annuler</string>
     <string name="git_sync">Synchronisation du dépôt</string>
     <string name="git_pull">Importer du serveur</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 48ff6d4b..764dc004 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -30,9 +30,8 @@
 
     <!-- PGPHandler -->
     <string name="provider_toast_text">OpenPGP プロバイダが選択されていません!</string>
-    <string name="okc_progress_text">OpenKeychain の待機中...</string>
-    <string name="clipboard_beginning_toast_text">パスワードをクリップボードにコピーしました </string>
-    <string name="clipboard_ending_toast_text"> 秒以内に張り付けしてください。</string>
+    <string name="okc_progress_text">OpenKeychain の待機中…</string>
+    <string name="clipboard_toast_text">パスワードをクリップボードにコピーしました %d 秒以内に張り付けしてください。</string>
     <string name="name_settings_toast_text">できるだけ設定に毎回アカウント名を設定してください</string>
     <string name="account_settings_dialog_text">プリファレンスに OpenKeychain アカウント (メールアドレス) を設定してください</string>
     <string name="account_settings_dialog_title">アカウント名が空です!</string>
@@ -40,7 +39,7 @@
     <string name="empty_toast_text">空のパスワードを使用したり、追加のコンテンツを空にすることはできません</string>
 
     <!-- Git Async Task -->
-    <string name="running_dialog_text">コマンドの実行中...</string>
+    <string name="running_dialog_text">コマンドの実行中…</string>
     <string name="jgit_error_dialog_title">Git 操作中にエラーが発生しました</string>
     <string name="jgit_error_dialog_text">jgit からのメッセージ: \n</string>
 
@@ -159,9 +158,9 @@
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">はい</string>
     <string name="dialog_no">いいえ</string>
-    <string name="dialog_positive">途中...</string>
-    <string name="dialog_negative">いや... later</string>
-    <string name="dialog_oops">おっと...</string>
+    <string name="dialog_positive">途中…</string>
+    <string name="dialog_negative">いや… later</string>
+    <string name="dialog_oops">おっと…</string>
     <string name="dialog_cancel">キャンセル</string>
     <string name="git_sync">リポジトリを同期</string>
     <string name="git_pull">リモートからプル</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8bba9c1e..4c8510e6 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -30,9 +30,8 @@
 
     <!-- PGPHandler -->
     <string name="provider_toast_text">Не выбран поставщик OpenPGP!</string>
-    <string name="okc_progress_text">Ожидание OpenKeychain...</string>
-    <string name="clipboard_beginning_toast_text">Пароль скопирован в буфер обмена, у вас есть </string>
-    <string name="clipboard_ending_toast_text"> секунд чтобы вставить его.</string>
+    <string name="okc_progress_text">Ожидание OpenKeychain…</string>
+    <string name="clipboard_toast_text">Пароль скопирован в буфер обмена, у вас есть %d секунд чтобы вставить его.</string>
     <string name="name_settings_toast_text">Пожалуйста, задайте имя пользователя в настройках</string>
     <string name="account_settings_dialog_text">Пожалуйста, задайте почту для OpenKeychain в настройках</string>
     <string name="account_settings_dialog_title">Пустое имя пользователя!</string>
@@ -40,7 +39,7 @@
     <string name="empty_toast_text">Вы не можете использовать пустой пароль или пустое поле информации</string>
 
     <!-- Git Async Task -->
-    <string name="running_dialog_text">Выполняется команда...</string>
+    <string name="running_dialog_text">Выполняется команда…</string>
     <string name="jgit_error_dialog_title">Произошла ошибка</string>
     <string name="jgit_error_dialog_text">Сообщение от jgit: \n</string>
 
@@ -155,9 +154,9 @@
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">Да</string>
     <string name="dialog_no">Нет</string>
-    <string name="dialog_positive">On my way...</string>
-    <string name="dialog_negative">Не ... позже</string>
-    <string name="dialog_oops">Упс...</string>
+    <string name="dialog_positive">On my way…</string>
+    <string name="dialog_negative">Не … позже</string>
+    <string name="dialog_oops">Упс…</string>
     <string name="dialog_cancel">Отмена</string>
     <string name="git_sync">Синхронизировать репозиторий</string>
     <string name="git_pull">Пулл с удаленного сервера</string>
@@ -173,7 +172,7 @@
     <string name="autofill_fill">Заполнить</string>
     <string name="autofill_apps_default">Использовать настройки по умолчанию</string>
     <string name="autofill_apps_first">Автоматически сопоставлять</string>
-    <string name="autofill_apps_match_ellipsis">Сопоставить с ... </string>
+    <string name="autofill_apps_match_ellipsis">Сопоставить с … </string>
     <string name="autofill_apps_match">Сопоставить с</string>
     <string name="autofill_apps_never">Никогда не сопоставлять</string>
     <string name="autofill_apps_delete">Удалить</string>
@@ -181,6 +180,6 @@
     <string name="settings">Настройки</string>
     <string name="no_repo_selected">Не выбран внешний репозиторий</string>
     <string name="no_repo_selected2">Не выбрын внешний репозиторий</string>
-    <string name="send_plaintext_password_to">Отправить пароль в открытом виде с помощью ...</string>
+    <string name="send_plaintext_password_to">Отправить пароль в открытом виде с помощью …</string>
     <string name="show_password">Показать пароль</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCH/strings.xml b/app/src/main/res/values-zh-rCH/strings.xml
index bfa3248c..d5cad54f 100644
--- a/app/src/main/res/values-zh-rCH/strings.xml
+++ b/app/src/main/res/values-zh-rCH/strings.xml
@@ -15,8 +15,7 @@
     <string name="autofill_description">在app中自动输入密码. 此功能只在 Andorid 4.3 及以上版本中可用. 在 Andorid 5.0 及以上版本中不依赖剪贴板</string>
     <string name="autofill_fill">输入</string>
     <string name="category_string">“类别:\"</string>
-    <string name="clipboard_beginning_toast_text">密码已复制到剪贴板, 你有</string>
-    <string name="clipboard_ending_toast_text">秒的时间将其粘贴到其他地方.</string>
+    <string name="clipboard_toast_text">密码已复制到剪贴板, 你有 %d 秒的时间将其粘贴到其他地方.</string>
     <string name="clone">从服务器Clone</string>
     <string name="clone_fragment_text">欢迎使用 Password Store 你可以选择创建新的版本库或将你已有的 git 版本库克隆到你的设备上</string>
     <string name="clone_settings">Clone</string>
@@ -35,10 +34,10 @@
     <string name="dialog_delete_msg">目标目录已存在. 当前版本仅支持单一储存. 真的要删除当前Password Store目录吗:</string>
     <string name="dialog_delete_title">目录已存在</string>
     <string name="dialog_do_not_delete">取消</string>
-    <string name="dialog_negative">呃... 算了吧</string>
+    <string name="dialog_negative">呃… 算了吧</string>
     <string name="dialog_no">否</string>
     <string name="dialog_ok">确定</string>
-    <string name="dialog_oops">糟糕...</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>
@@ -57,7 +56,7 @@
     <string name="name_settings_toast_text">请尽快在设置中设置您的用户名</string>
     <string name="no_repo_selected">未选择外部 Repo</string>
     <string name="no_repo_selected2">未选择外部 Repo</string>
-    <string name="okc_progress_text">正等待 OpenKeyChain...</string>
+    <string name="okc_progress_text">正等待 OpenKeyChain…</string>
     <string name="passphrase_dialog_text">请为您的 SSH 密钥提供口令. 若口令为空则请留空</string>
     <string name="passphrase_dialog_title">认证</string>
     <string name="password_dialog_text">请提供当前 Repo 的密码</string>
@@ -112,8 +111,8 @@
     <string name="read_only_dialog_text">你将使用一个只读的 Repo, 你无法将其提交</string>
     <string name="refresh_list">刷新列表</string>
     <string name="remove_commit_text">[ANDROID PwdStore] Remove &#160;</string>
-    <string name="running_dialog_text">执行命令中...</string>
-    <string name="send_plaintext_password_to">将密码以纯文本发送...</string>
+    <string name="running_dialog_text">执行命令中…</string>
+    <string name="send_plaintext_password_to">将密码以纯文本发送…</string>
     <string name="server_name">服务器</string>
     <string name="server_path">Repo 路径</string>
     <string name="server_path_hint">path/to/pass</string>
@@ -149,6 +148,6 @@
     <string name="warn_malformed_url_port">如果使用自定义端口, 请提供绝对路径 (从根目录开始)</string>
     <string name="dialog_positive">现在就去</string>
     <string name="server_resulting_url">生成的 URL</string>
-    <string name="autofill_apps_match_ellipsis">匹配...</string>
+    <string name="autofill_apps_match_ellipsis">匹配…</string>
     <string name="pref_crypto_title">加密</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index ff986197..1e6db97e 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -15,8 +15,7 @@
     <string name="autofill_description">在app中自動填入密碼. 此功能只能在 Andorid 4.3 及以上版本中使用. 在 Andorid 5.0 及以上版本中不需要剪貼簿</string>
     <string name="autofill_fill">輸入</string>
     <string name="category_string">“分類:\"</string>
-    <string name="clipboard_beginning_toast_text">密碼已複製到剪貼簿, 你有</string>
-    <string name="clipboard_ending_toast_text">秒的時間將其貼上到其他地方.</string>
+    <string name="clipboard_toast_text">密碼已複製到剪貼簿, 你有 %d 秒的時間將其貼上到其他地方.</string>
     <string name="clone">從伺服器 Clone</string>
     <string name="clone_fragment_text">歡迎使用 Password Store 你可以選擇建立新的 Repo 或將你已有的 git repo clone 到你的裝置上</string>
     <string name="clone_settings">Clone</string>
@@ -35,10 +34,10 @@
     <string name="dialog_delete_msg">目標目錄已存在. 目前版本僅支援單一儲存區. 真的要刪除現有的 Password Store 目錄嗎:</string>
     <string name="dialog_delete_title">目錄已存在</string>
     <string name="dialog_do_not_delete">取消</string>
-    <string name="dialog_negative">呃... 算了吧</string>
+    <string name="dialog_negative">呃… 算了吧</string>
     <string name="dialog_no">否</string>
     <string name="dialog_ok">確定</string>
-    <string name="dialog_oops">糟糕...</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>
@@ -57,7 +56,7 @@
     <string name="name_settings_toast_text">请盡快在選項中設定你的使用者名稱</string>
     <string name="no_repo_selected">未選擇外部 Repo</string>
     <string name="no_repo_selected2">未選擇外部 Repo</string>
-    <string name="okc_progress_text">正在等待 OpenKeyChain...</string>
+    <string name="okc_progress_text">正在等待 OpenKeyChain…</string>
     <string name="passphrase_dialog_text">請為你的 SSH 金鑰設定密碼. 若密碼為空請留空</string>
     <string name="passphrase_dialog_title">認證</string>
     <string name="password_dialog_text">請提供目前 Repo 的密碼</string>
@@ -112,8 +111,8 @@
     <string name="read_only_dialog_text">你使用了一個唯讀的 Repo, 你無法 commit</string>
     <string name="refresh_list">重新整理</string>
     <string name="remove_commit_text">[ANDROID PwdStore] Remove &#160;</string>
-    <string name="running_dialog_text">執行中...</string>
-    <string name="send_plaintext_password_to">將密碼以純文字傳送...</string>
+    <string name="running_dialog_text">執行中…</string>
+    <string name="send_plaintext_password_to">將密碼以純文字傳送…</string>
     <string name="server_name">伺服器</string>
     <string name="server_path">Repo 路徑</string>
     <string name="server_path_hint">path/to/pass</string>
@@ -149,6 +148,6 @@
     <string name="warn_malformed_url_port">如果使用自定 port, 請使用绝對路徑 (從根目錄開始)</string>
     <string name="dialog_positive">確定</string>
     <string name="server_resulting_url">生成的 URL</string>
-    <string name="autofill_apps_match_ellipsis">匹配...</string>
+    <string name="autofill_apps_match_ellipsis">匹配…</string>
     <string name="pref_crypto_title">加密</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5823c016..8c5e2102 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,9 +31,8 @@
 
     <!-- PGPHandler -->
     <string name="provider_toast_text">No OpenPGP Provider selected!</string>
-    <string name="okc_progress_text">Waiting for OpenKeychain...</string>
-    <string name="clipboard_beginning_toast_text">Password copied to clipboard, you have </string>
-    <string name="clipboard_ending_toast_text"> seconds to paste it somewhere.</string>
+    <string name="okc_progress_text">Waiting for OpenKeychain…</string>
+    <string name="clipboard_toast_text">Password copied to clipboard, you have %d seconds to paste it somewhere.</string>
     <string name="name_settings_toast_text">Please set your account name in settings whenever you can</string>
     <string name="account_settings_dialog_text">Please set your OpenKeychain account (email) in the preferences</string>
     <string name="account_settings_dialog_title">Account name empty!</string>
@@ -41,7 +40,7 @@
     <string name="empty_toast_text">You cannot use an empty password or empty extra content</string>
 
     <!-- Git Async Task -->
-    <string name="running_dialog_text">Running command...</string>
+    <string name="running_dialog_text">Running command…</string>
     <string name="jgit_error_dialog_title">An error occurred during a Git operation</string>
     <string name="jgit_error_dialog_text">Message from jgit: \n</string>
 
@@ -96,6 +95,8 @@
     <!-- DECRYPT Layout -->
     <string name="crypto_category">Category</string>
     <string name="action_search">Search</string>
+    <string name="password">Password:</string>
+    <string name="extra_content">Extra content:</string>
 
     <!-- Preferences -->
     <string name="pref_git_title">Git</string>
@@ -169,9 +170,9 @@
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">Yes</string>
     <string name="dialog_no">No</string>
-    <string name="dialog_positive">On my way...</string>
-    <string name="dialog_negative">Nah... later</string>
-    <string name="dialog_oops">Oops...</string>
+    <string name="dialog_positive">On my way…</string>
+    <string name="dialog_negative">Nah… later</string>
+    <string name="dialog_oops">Oops…</string>
     <string name="dialog_cancel">Cancel</string>
     <string name="git_sync">Synchronize repository</string>
     <string name="git_pull">Pull from remote</string>
@@ -191,6 +192,8 @@
     <string name="autofill_apps_match">Match with</string>
     <string name="autofill_apps_never">Never match</string>
     <string name="autofill_apps_delete">Delete</string>
+    <string name="autofill_pick">Pick…</string>
+    <string name="autofill_pick_and_match">Pick and match…</string>
     <string name="refresh_list">Refresh list</string>
     <string name="settings">Settings</string>
     <string name="no_repo_selected">No external repository selected</string>