diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-20 20:24:24 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-20 20:24:24 +0200 |
| commit | ccc1d2e0063a8ab54673eaa5413cb739317c77ee (patch) | |
| tree | d26c6931455958dddbc5c923b707f827e0491017 /OpenKeychain | |
| parent | 735040e19302a99587c5dfd058de7fd0f1db6ef5 (diff) | |
| parent | 2cc265390c8710a4a8b250ad84df2466a705336f (diff) | |
| download | open-keychain-ccc1d2e0063a8ab54673eaa5413cb739317c77ee.tar.gz open-keychain-ccc1d2e0063a8ab54673eaa5413cb739317c77ee.tar.bz2 open-keychain-ccc1d2e0063a8ab54673eaa5413cb739317c77ee.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 4 |
2 files changed, 3 insertions, 3 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 e357db412..f3af51397 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java @@ -690,7 +690,7 @@ public class PgpKeyOperation { progress(R.string.progress_modify_subkeyadd, (i-1) * (100 / saveParcel.mAddSubKeys.size())); SaveKeyringParcel.SubkeyAdd add = saveParcel.mAddSubKeys.get(i); - log.add(LogLevel.INFO, LogType.MSG_MF_SUBKEY_NEW, indent, add.mKeysize, + log.add(LogLevel.INFO, LogType.MSG_MF_SUBKEY_NEW, indent, Integer.toString(add.mKeysize), PgpKeyHelper.getAlgorithmInfo(add.mAlgorithm) ); if (add.mExpiry == null) { diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 3175d679b..71f4504d7 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -652,14 +652,14 @@ <string name="msg_mf_error_sig">Signature exception!</string> <string name="msg_mf_master">Modifying master certifications</string> <string name="msg_mf_passphrase">Changing passphrase for keyring…</string> - <string name="msg_mf_passphrase_key">Changing passphrase for subkey %s</string> + <string name="msg_mf_passphrase_key">Re-encrypting subkey %s with new passphrase</string> <string name="msg_mf_passphrase_empty_retry">Setting new passphrase failed, trying again with empty old passphrase</string> <string name="msg_mf_passphrase_fail">Passphrase for subkey could not be changed! (Does it have a different one from the other keys?)</string> <string name="msg_mf_primary_replace_old">Replacing certificate of previous primary user id</string> <string name="msg_mf_primary_new">Generating new certificate for new primary user id</string> <string name="msg_mf_subkey_change">Modifying subkey %s</string> <string name="msg_mf_error_subkey_missing">Tried to operate on missing subkey %s!</string> - <string name="msg_mf_subkey_new">Generating new %1$s bit %2$s subkey</string> + <string name="msg_mf_subkey_new">Adding new subkey of type %2$s (%1$s bit)</string> <string name="msg_mf_subkey_new_id">New subkey ID: %s</string> <string name="msg_mf_error_past_expiry">Expiry date cannot be in the past!</string> <string name="msg_mf_subkey_revoke">Revoking subkey %s</string> |