diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-31 20:26:12 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-31 20:26:12 +0200 |
| commit | bdf0436c9494f25cd1efaa64b6eb180b6d2673d6 (patch) | |
| tree | 5f928c1949c92ee0ee86b60276a5c5c792868e8d /OpenKeychain/src/main/res/values | |
| parent | 5e7eed239ffc26f2d78b29c0f6dd3772f49dc4e9 (diff) | |
| parent | e9a2f256b9324cc898061d2a2ebde18446ce1dd1 (diff) | |
| download | open-keychain-bdf0436c9494f25cd1efaa64b6eb180b6d2673d6.tar.gz open-keychain-bdf0436c9494f25cd1efaa64b6eb180b6d2673d6.tar.bz2 open-keychain-bdf0436c9494f25cd1efaa64b6eb180b6d2673d6.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 16970b4dd..2a2d18c0d 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -262,6 +262,7 @@ <!-- progress dialogs, usually ending in '…' --> <string name="progress_done">Done.</string> <string name="progress_cancel">Cancel</string> + <string name="progress_cancelling">cancelling…</string> <string name="progress_saving">saving…</string> <string name="progress_importing">importing…</string> <string name="progress_exporting">exporting…</string> @@ -381,8 +382,10 @@ </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_error">Error importing keys!</string> <string name="import_with_warnings">, with warnings</string> + <string name="import_with_cancelled">, until cancelled</string> <!-- Intent labels --> <string name="intent_decrypt_file">Decrypt File with OpenKeychain</string> @@ -519,6 +522,9 @@ <!-- LogType log messages. Errors should have _ERROR_ in their name and end with a ! --> + <string name="msg_internal_error">Internal error!</string> + <string name="msg_cancelled">Operation cancelled.</string> + <!-- Import Public log entries --> <string name="msg_ip_apply_batch">Applying insert batch operation.</string> <string name="msg_ip_bad_type_secret">Tried to import secret keyring as public. This is a bug, please file a report!</string> @@ -744,7 +750,6 @@ <string name="passp_cache_notif_pwd">Password</string> <!-- unsorted --> - <string name="internal_error">Internal error!</string> <string name="section_certifier_id">Certifier</string> <string name="section_cert">Certificate Details</string> <string name="label_user_id">Identity</string> |