diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-27 15:42:09 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-27 15:42:09 +0200 |
| commit | cb2eb8aca2e7aab6243fd3e1a3313c941e3f1998 (patch) | |
| tree | ad9ea6a131d75eb0a255c628cdd813d585b24489 /OpenKeychain/src/main/res/values/strings.xml | |
| parent | 12a5b2174f79d93e8531fa4e0b3fc0def3796ca9 (diff) | |
| download | open-keychain-cb2eb8aca2e7aab6243fd3e1a3313c941e3f1998.tar.gz open-keychain-cb2eb8aca2e7aab6243fd3e1a3313c941e3f1998.tar.bz2 open-keychain-cb2eb8aca2e7aab6243fd3e1a3313c941e3f1998.zip | |
small language fixes for previous commit
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index d8c73bd9e..6e487adfa 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -500,6 +500,8 @@ <string name="cert_verify_error">error!</string> <string name="cert_verify_unavailable">key unavailable</string> + <!-- LogType log messages. Errors should have _ERROR_ in their name and end with a ! --> + <!-- 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> @@ -619,14 +621,14 @@ <string name="msg_kc_uid_remove">Removing invalid user id %s</string> <!-- Keyring merging log entries --> + <string name="msg_mg_error_secret_dummy">New public subkey found, but secret subkey dummy generation is not supported!</string> + <string name="msg_mg_error_heterogeneous">Tried to merge keyrings with differing fingerprints!</string> + <string name="msg_mg_error_encode">Fatal error encoding signature!</string> <string name="msg_mg_public">Merging into public keyring %s</string> <string name="msg_mg_secret">Merging into secret keyring %s</string> - <string name="msg_mg_fatal_encode">Fatal error encoding signature</string> - <string name="msg_mg_heterogeneous">Tried to merge keyrings with differing fingerprints!</string> <string name="msg_mg_new_subkey">Adding new subkey %s</string> <string name="msg_mg_found_new">Found %s new certificates in keyring</string> <string name="msg_mg_unchanged">No new certificates</string> - <string name="msg_mg_no_secret_keyring">No secret keyring to add subkey to</string> <!-- createSecretKeyRing --> <string name="msg_cr">Generating new master key</string> |