diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-10 01:30:20 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-10 01:31:28 +0200 |
| commit | 067ffa876d4ec4e1f2ee63c851cb3c48f7eb1aa2 (patch) | |
| tree | dfb89a5775dffc4b279082ff26b8ac620f464d8f /OpenKeychain/src/main/res/values | |
| parent | 97c679ada3461e676f65bd4c3258302ee5a44a51 (diff) | |
| download | open-keychain-067ffa876d4ec4e1f2ee63c851cb3c48f7eb1aa2.tar.gz open-keychain-067ffa876d4ec4e1f2ee63c851cb3c48f7eb1aa2.tar.bz2 open-keychain-067ffa876d4ec4e1f2ee63c851cb3c48f7eb1aa2.zip | |
import-log: add OperationResults, use it in ImportKeys operation
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 6f21900fe..86219da70 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -529,13 +529,17 @@ <string name="msg_ip_fail_io_exc">Operation failed due to i/o error</string> <string name="msg_ip_fail_op_ex">Operation failed due to database error</string> <string name="msg_ip_fail_remote_ex">Operation failed due to internal error</string> - <string name="msg_ip_importing">Importing public keyring</string> + <string name="msg_ip_importing">Importing public keyring %s</string> <string name="msg_ip_insert_keyring">Inserting keyring data</string> - <string name="msg_ip_insert_subkey">Inserting subkey %s</string> <string name="msg_ip_insert_subkeys">Inserting subkeys</string> <string name="msg_ip_preserving_secret">Preserving available secret key</string> - <string name="msg_ip_reinsert_secret">Re-inserting secret key</string> + <string name="msg_ip_subkey">Processing subkey %s</string> + <string name="msg_ip_subkey_expired">Subkey expired on %s</string> + <string name="msg_ip_subkey_expires">Subkey expires on %s</string> + <string name="msg_ip_subkey_flags">Subkey flags: %s</string> + <string name="msg_ip_subkey_future">Subkey creation date lies in the future! (%s)</string> <string name="msg_ip_success">Successfully inserted public keyring</string> + <string name="msg_ip_reinsert_secret">Re-inserting secret key</string> <string name="msg_ip_trust_retrieve">Retrieving trusted keys</string> <string name="msg_ip_trust_using">Using %s trusted keys</string> <string name="msg_ip_trust_using_sec">Secret key available, self certificates are trusted</string> @@ -546,6 +550,7 @@ <string name="msg_ip_uid_classifying">Classifying user ids</string> <string name="msg_ip_uid_insert">Inserting user ids</string> <string name="msg_ip_uid_processing">Processing user id %s</string> + <string name="msg_ip_uid_revoked">Found uid revocation certificate</string> <string name="msg_ip_uid_self_bad">Bad self certificate encountered!</string> <string name="msg_ip_uid_self_good">Found good self certificate</string> <string name="msg_ip_uid_self_ignoring_old">Ignoring older self certificate</string> @@ -558,5 +563,6 @@ <string name="msg_is_subkey_ok">Marked %s as available</string> <string name="msg_is_subkey_stripped">Marked %s as stripped</string> <string name="msg_is_success">Successfully inserted secret keyring</string> + <string name="title_log_display">Log</string> </resources> |