cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve CertifyResult, add custom notify

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-10-04 16:01:24 +02:00
parent 0e0e3d8dd0
commit d004bf236b
15 changed files with 140 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/res/values-cs/strings.xml
View File

@@ -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>

4
OpenKeychain/src/main/res/values-de/strings.xml
View File

@@ -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>

4
OpenKeychain/src/main/res/values-es/strings.xml
View File

@@ -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>

4
OpenKeychain/src/main/res/values-fr/strings.xml
View File

@@ -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>

2
OpenKeychain/src/main/res/values-it/strings.xml
View File

@@ -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>

4
OpenKeychain/src/main/res/values-ja/strings.xml
View File

@@ -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>

2
OpenKeychain/src/main/res/values-ru/strings.xml
View File

@@ -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>

4
OpenKeychain/src/main/res/values-sl/strings.xml
View File

@@ -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>

4
OpenKeychain/src/main/res/values-sr/strings.xml
View File

@@ -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>

2
OpenKeychain/src/main/res/values-uk/strings.xml
View File

@@ -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>

27
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -387,6 +387,11 @@
<string name="import_qr_code_too_short_fingerprint">"Fingerprint is too short (&lt; 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>