moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-04 16:25:05 -05:00
Code Issues Releases Wiki Activity

slightly change wording in merge logs

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-10-25 02:50:44 +02:00
parent c5028dc9ce
commit 748049fb5b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
View File

@ -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;

4
OpenKeychain/src/main/res/values/strings.xml
View File

@ -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>