diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-04 16:01:24 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-04 16:01:24 +0200 |
commit | d004bf236bd51817adf5963a3f970acd4e5a243e (patch) | |
tree | a8ff39cd0a6ee74bddc888d7a1a65f3eaa84a5ca /OpenKeychain/src/main/res | |
parent | 0e0e3d8dd09deb2ff36d46ccceba08bb5c0967ce (diff) | |
download | open-keychain-d004bf236bd51817adf5963a3f970acd4e5a243e.tar.gz open-keychain-d004bf236bd51817adf5963a3f970acd4e5a243e.tar.bz2 open-keychain-d004bf236bd51817adf5963a3f970acd4e5a243e.zip |
improve CertifyResult, add custom notify
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/values-cs/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-de/strings.xml | 4 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-es/strings.xml | 4 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-fr/strings.xml | 4 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-it/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-ja/strings.xml | 4 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-ru/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-sl/strings.xml | 4 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-sr/strings.xml | 4 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-uk/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 27 |
11 files changed, 38 insertions, 21 deletions
diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml index 9f676c6f9..a7090aaf0 100644 --- a/OpenKeychain/src/main/res/values-cs/strings.xml +++ b/OpenKeychain/src/main/res/values-cs/strings.xml @@ -329,7 +329,7 @@ <string name="view_log">Zobrazit log</string> <string name="import_error_nothing">Nic k importu</string> <string name="import_error_nothing_cancelled">Import zrušen.</string> - <string name="import_with_warnings">, s varováními</string> + <string name="with_warnings">, s varováními</string> <plurals name="import_error"> <item quantity="one">Import selhal!</item> <item quantity="few">Import %d klíčů selhal!</item> diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml index 1ff3fa024..d537bd6c3 100644 --- a/OpenKeychain/src/main/res/values-de/strings.xml +++ b/OpenKeychain/src/main/res/values-de/strings.xml @@ -369,8 +369,8 @@ <string name="view_log">Log ansehen</string> <string name="import_error_nothing">Nichts zu importieren.</string> <string name="import_error_nothing_cancelled">Import abgebrochen.</string> - <string name="import_with_warnings">, mit Warnungen</string> - <string name="import_with_cancelled">. bis abgebrochen wurde</string> + <string name="with_warnings">, mit Warnungen</string> + <string name="with_cancelled">. bis abgebrochen wurde</string> <plurals name="import_error"> <item quantity="one">Importieren fehlgeschlagen!</item> <item quantity="other">Importieren von %d Schlüsseln fehlgeschlagen!</item> diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml index 968ece35a..d1836233c 100644 --- a/OpenKeychain/src/main/res/values-es/strings.xml +++ b/OpenKeychain/src/main/res/values-es/strings.xml @@ -357,8 +357,8 @@ <string name="view_log">Ver registro (log)</string> <string name="import_error_nothing">No hay nada que importar.</string> <string name="import_error_nothing_cancelled">Importación cancelada.</string> - <string name="import_with_warnings">, con advertencias</string> - <string name="import_with_cancelled">, hasta que este cancelada</string> + <string name="with_warnings">, con advertencias</string> + <string name="with_cancelled">, hasta que este cancelada</string> <!--Intent labels--> <string name="intent_decrypt_file">Descifrar archivo con OpenKeychain</string> <string name="intent_import_key">Importar clave con OpenKeychain</string> diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml index 91940c7c3..ef1659e7d 100644 --- a/OpenKeychain/src/main/res/values-fr/strings.xml +++ b/OpenKeychain/src/main/res/values-fr/strings.xml @@ -357,8 +357,8 @@ <string name="view_log">Consulter le journal</string> <string name="import_error_nothing">Rien à importer.</string> <string name="import_error_nothing_cancelled">Importation annulée.</string> - <string name="import_with_warnings">, avec des avertissements</string> - <string name="import_with_cancelled">, jusqu\'à l\'annulation</string> + <string name="with_warnings">, avec des avertissements</string> + <string name="with_cancelled">, jusqu\'à l\'annulation</string> <!--Intent labels--> <string name="intent_decrypt_file">Déchiffrer le fichier avec OpenKeychain</string> <string name="intent_import_key">Importer la clef avec OpenKeychain</string> diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml index 5c652fd73..a26dee6b3 100644 --- a/OpenKeychain/src/main/res/values-it/strings.xml +++ b/OpenKeychain/src/main/res/values-it/strings.xml @@ -362,7 +362,7 @@ Non potrai annullare!</string> <string name="view_log">Mostra registro</string> <string name="import_error_nothing">Niente da importare</string> <string name="import_error_nothing_cancelled">Importazione cancellata.</string> - <string name="import_with_warnings">, con avvisi</string> + <string name="with_warnings">, con avvisi</string> <!--Intent labels--> <string name="intent_decrypt_file">Decodifica File con OpenKeychain</string> <string name="intent_import_key">Importa Chiave con OpenKeychain</string> diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index d1a90ff8c..661317852 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -371,8 +371,8 @@ <string name="view_log">ログを見る</string> <string name="import_error_nothing">インポートするものがありません。</string> <string name="import_error_nothing_cancelled">インポートをキャンセルしました。</string> - <string name="import_with_warnings">、とワーニング</string> - <string name="import_with_cancelled">、キャンセルされるまで</string> + <string name="with_warnings">、とワーニング</string> + <string name="with_cancelled">、キャンセルされるまで</string> <plurals name="import_error"> <item quantity="other">%d 個の鍵のインポート失敗!</item> </plurals> diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml index 5ce53a9f1..73ef1ed19 100644 --- a/OpenKeychain/src/main/res/values-ru/strings.xml +++ b/OpenKeychain/src/main/res/values-ru/strings.xml @@ -311,7 +311,7 @@ </plurals> <string name="view_log">Смотреть журнал</string> <string name="import_error_nothing">Нет данных для импорта.</string> - <string name="import_with_warnings">, с предупреждениями</string> + <string name="with_warnings">, с предупреждениями</string> <!--Intent labels--> <string name="intent_decrypt_file">OpenKeychain: Расшифровать файл</string> <string name="intent_import_key">OpenKeychain: Импортировать ключ</string> diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml index 491bf5cf5..0f54c95ef 100644 --- a/OpenKeychain/src/main/res/values-sl/strings.xml +++ b/OpenKeychain/src/main/res/values-sl/strings.xml @@ -319,8 +319,8 @@ <string name="view_log">Poglej dnevnik</string> <string name="import_error_nothing">Nič za uvoziti.</string> <string name="import_error_nothing_cancelled">Uvoz preklican.</string> - <string name="import_with_warnings">, z opozorilom</string> - <string name="import_with_cancelled"> do preklica</string> + <string name="with_warnings">, z opozorilom</string> + <string name="with_cancelled"> do preklica</string> <!--Intent labels--> <string name="intent_decrypt_file">Dešifriraj datoteko z OpenKeychain</string> <string name="intent_import_key">Uvozi ključ z OpenKeychain</string> diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml index c1121ef4d..c765d27af 100644 --- a/OpenKeychain/src/main/res/values-sr/strings.xml +++ b/OpenKeychain/src/main/res/values-sr/strings.xml @@ -330,8 +330,8 @@ <string name="view_log">Прикажи дневник</string> <string name="import_error_nothing">Нема ништа за увоз.</string> <string name="import_error_nothing_cancelled">Увоз је отказан.</string> - <string name="import_with_warnings">, са упозорењима</string> - <string name="import_with_cancelled">, док није отказано</string> + <string name="with_warnings">, са упозорењима</string> + <string name="with_cancelled">, док није отказано</string> <!--Intent labels--> <string name="intent_decrypt_file">Дешифруј фајл помоћу Отвореног кључарника</string> <string name="intent_import_key">Увези кључ у Отворени кључарник</string> diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml index f38a542be..d3b3f1753 100644 --- a/OpenKeychain/src/main/res/values-uk/strings.xml +++ b/OpenKeychain/src/main/res/values-uk/strings.xml @@ -327,7 +327,7 @@ </plurals> <string name="view_log">Переглянути журнал</string> <string name="import_error_nothing">Нема що імпортувати.</string> - <string name="import_with_warnings">, із застереженнями</string> + <string name="with_warnings">, із застереженнями</string> <!--Intent labels--> <string name="intent_decrypt_file">Розшифрувати файл з OpenKeychain</string> <string name="intent_import_key">Імпортувати ключ з OpenKeychain</string> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 28933ac89..4ce73b5cb 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -387,6 +387,11 @@ <string name="import_qr_code_too_short_fingerprint">"Fingerprint is too short (< 16 characters)"</string> <string name="import_qr_code_button">"Scan QR Code…"</string> + <!-- Generic result toast --> + <string name="view_log">"View Log"</string> + <string name="with_warnings">", with warnings"</string> + <string name="with_cancelled">", until cancelled"</string> + <!-- Import result toast --> <plurals name="import_keys_added_and_updated_1"> <item quantity="one">"Successfully imported key"</item> @@ -408,15 +413,26 @@ <item quantity="one">"Import failed for one key!"</item> <item quantity="other">"Import failed for %d keys!"</item> </plurals> - <string name="view_log">"View Log"</string> - <string name="import_error_nothing">"Nothing to import."</string> - <string name="import_error_nothing_cancelled">"Import cancelled."</string> - <string name="import_with_warnings">", with warnings"</string> - <string name="import_with_cancelled">", until cancelled"</string> <plurals name="import_error"> <item quantity="one">"Import failed!"</item> <item quantity="other">"Import of %d keys failed!"</item> </plurals> + <string name="import_error_nothing">"Nothing to import."</string> + <string name="import_error_nothing_cancelled">"Import cancelled."</string> + + <!-- Certify result toast --> + <plurals name="certify_keys_ok"> + <item quantity="one">"Successfully certified key%2$s."</item> + <item quantity="other">"Successfully certified %1$d keys%2$s."</item> + </plurals> + <plurals name="certify_keys_with_errors"> + <item quantity="one">"Certification failed!"</item> + <item quantity="other">"Certification failed for %d keys!"</item> + </plurals> + <plurals name="certify_error"> + <item quantity="one">"Certification failed!"</item> + <item quantity="other">"Certification of %d keys failed!"</item> + </plurals> <!-- Intent labels --> <string name="intent_decrypt_file">"Decrypt File with OpenKeychain"</string> @@ -882,6 +898,7 @@ <item quantity="other">"Certifying %1$d user ids for key %2$s"</item> </plurals> <string name="msg_crt_error_master_not_found">"Master key not found!"</string> + <string name="msg_crt_error_nothing">"No keys certified!"</string> <string name="msg_crt_error_unlock">"Error unlocking master key!"</string> <string name="msg_crt_fp_mismatch">"Fingerprint mismatch, not certifying!"</string> <string name="msg_crt">"Certifying keyrings"</string> |