diff options
Diffstat (limited to 'OpenKeychain/src/main')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | 1 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java index 5924e08f3..a1479b0c6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java @@ -787,6 +787,7 @@ public class UncachedKeyRing { */ public UncachedKeyRing merge(UncachedKeyRing other, OperationLog log, int indent) { + // This is logged in the calling method to provide more meta info // log.add(isSecret() ? LogType.MSG_MG_SECRET : LogType.MSG_MG_PUBLIC, // indent, KeyFormattingUtils.convertKeyIdToHex(getMasterKeyId())); indent += 1; diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index f303f25b2..9ce1d0868 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -766,7 +766,7 @@ <string name="msg_mg_secret">"Merging into secret keyring %s"</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_unchanged">"Nothing to merge"</string> <!-- createSecretKeyRing --> <string name="msg_cr">"Generating new master key"</string> @@ -954,7 +954,7 @@ <string name="msg_import_keyserver">"Using keyserver %s"</string> <string name="msg_import_fingerprint_error">"Fingerprint of fetched key didn't match expected!"</string> <string name="msg_import_fingerprint_ok">"Fingerprint check OK"</string> - <string name="msg_import_merge">"Merging keyring data from keybase and keyserver"</string> + <string name="msg_import_merge">"Merging retrieved data"</string> <string name="msg_import_error">"Import operation failed!"</string> <string name="msg_import_partial">"Import operation successful, with errors!"</string> <string name="msg_import_success">"Import operation successful"</string> |