diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-18 19:39:16 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-18 19:39:16 +0200 |
| commit | 134f8471c05724c312085ce5b8eae2aec8cb8a52 (patch) | |
| tree | b3f079c63587df5841cac99f645e0d337d91b458 /OpenKeychain/src/main/res/values/strings.xml | |
| parent | f80228a08dbb6c9cfa350f9f9f71d76ff8f313c2 (diff) | |
| download | open-keychain-134f8471c05724c312085ce5b8eae2aec8cb8a52.tar.gz open-keychain-134f8471c05724c312085ce5b8eae2aec8cb8a52.tar.bz2 open-keychain-134f8471c05724c312085ce5b8eae2aec8cb8a52.zip | |
consolidate: add key import routines with consolidation
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 4282d6abd..d9c033a96 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -583,7 +583,7 @@ <string name="msg_kc_sub_revoke_bad_err">Removing bad subkey revocation key</string> <string name="msg_kc_sub_revoke_bad">Removing bad subkey revocation key</string> <string name="msg_kc_sub_revoke_dup">Removing redundant keyring revocation key</string> - <string name="msg_kc_success">Keyring canonicalization successful</string> + <string name="msg_kc_success">Keyring canonicalization successful, no changes</string> <string name="msg_kc_success_bad">Keyring canonicalization successful, removed %s erroneous certificates</string> <string name="msg_kc_success_bad_and_red">Keyring canonicalization successful, removed %1$s erroneous and %2$s redundant certificates</string> <string name="msg_kc_success_redundant">Keyring canonicalization successful, removed %s redundant certificates</string> @@ -600,8 +600,8 @@ <!-- Keyring merging log entries --> - <string name="msg_mg_public">Merging into secret keyring %s</string> - <string name="msg_mg_secret">Merging into public keyring %s</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 consolidate heterogeneous keyrings</string> <string name="msg_mg_new_subkey">Adding new subkey %s</string> |