aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-10-07 17:50:09 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-10-07 17:50:09 +0200
commit27d062496f84fb06903592d6ceabb3488e4378a5 (patch)
tree26bbe76b3419cbfe16130e4f53499672b0547e9f /OpenKeychain/src/main
parent355bcfbb662a840db4b27c09e9c4db892eb317de (diff)
downloadopen-keychain-27d062496f84fb06903592d6ceabb3488e4378a5.tar.gz
open-keychain-27d062496f84fb06903592d6ceabb3488e4378a5.tar.bz2
open-keychain-27d062496f84fb06903592d6ceabb3488e4378a5.zip
Fix MSG_MF_UID_PRIMARY log
Diffstat (limited to 'OpenKeychain/src/main')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java2
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index c4070e39a..43256fe28 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -557,7 +557,7 @@ public class PgpKeyOperation {
// keep track if we actually changed one
boolean ok = false;
- log.add(LogType.MSG_MF_UID_PRIMARY, indent);
+ log.add(LogType.MSG_MF_UID_PRIMARY, indent, saveParcel.mChangePrimaryUserId);
indent += 1;
// we work on the modifiedPublicKey here, to respect new or newly revoked uids
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 62d974554..afcd19f25 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -786,7 +786,7 @@
<string name="msg_mf_subkey_strip">"Stripping subkey %s"</string>
<string name="msg_mf_success">"Keyring successfully modified"</string>
<string name="msg_mf_uid_add">"Adding user id %s"</string>
- <string name="msg_mf_uid_primary">"Changing primary uid to %s"</string>
+ <string name="msg_mf_uid_primary">"Changing primary user id to %s"</string>
<string name="msg_mf_uid_revoke">"Revoking user id %s"</string>
<string name="msg_mf_uid_error_empty">"User ID must not be empty!"</string>
<string name="msg_mf_unlock_error">"Error unlocking keyring!"</string>