mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-24 01:32:16 -05:00
slightly change wording in merge logs
This commit is contained in:
parent
c5028dc9ce
commit
748049fb5b
@ -787,6 +787,7 @@ public class UncachedKeyRing {
|
|||||||
*/
|
*/
|
||||||
public UncachedKeyRing merge(UncachedKeyRing other, OperationLog log, int indent) {
|
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,
|
// log.add(isSecret() ? LogType.MSG_MG_SECRET : LogType.MSG_MG_PUBLIC,
|
||||||
// indent, KeyFormattingUtils.convertKeyIdToHex(getMasterKeyId()));
|
// indent, KeyFormattingUtils.convertKeyIdToHex(getMasterKeyId()));
|
||||||
indent += 1;
|
indent += 1;
|
||||||
|
@ -766,7 +766,7 @@
|
|||||||
<string name="msg_mg_secret">"Merging into secret keyring %s"</string>
|
<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_new_subkey">"Adding new subkey %s"</string>
|
||||||
<string name="msg_mg_found_new">"Found %s new certificates in keyring"</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 -->
|
<!-- createSecretKeyRing -->
|
||||||
<string name="msg_cr">"Generating new master key"</string>
|
<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_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_error">"Fingerprint of fetched key didn't match expected!"</string>
|
||||||
<string name="msg_import_fingerprint_ok">"Fingerprint check OK"</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_error">"Import operation failed!"</string>
|
||||||
<string name="msg_import_partial">"Import operation successful, with errors!"</string>
|
<string name="msg_import_partial">"Import operation successful, with errors!"</string>
|
||||||
<string name="msg_import_success">"Import operation successful"</string>
|
<string name="msg_import_success">"Import operation successful"</string>
|
||||||
|
Loading…
Reference in New Issue
Block a user