diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-25 21:15:12 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-25 21:15:12 +0200 |
| commit | 71e3fb53809de69980baa45ca43d2e769b20e855 (patch) | |
| tree | 42755ad6d88fc55f70db3e3d8bc549bd76f9e36b /OpenKeychain | |
| parent | 0abfff0b0e72011bfdee99481598882306570177 (diff) | |
| parent | 26bd847c32cdc74b9526091dee96c6e8c87cd55c (diff) | |
| download | open-keychain-71e3fb53809de69980baa45ca43d2e769b20e855.tar.gz open-keychain-71e3fb53809de69980baa45ca43d2e769b20e855.tar.bz2 open-keychain-71e3fb53809de69980baa45ca43d2e769b20e855.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java index 21d94084a..149640bcf 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java @@ -362,8 +362,8 @@ public abstract class OperationResult implements Parcelable { MSG_IS_SUCCESS (LogLevel.OK, R.string.msg_is_success), // keyring canonicalization - MSG_KC_PUBLIC (LogLevel.DEBUG, R.string.msg_kc_public), - MSG_KC_SECRET (LogLevel.DEBUG, R.string.msg_kc_secret), + MSG_KC_PUBLIC (LogLevel.START, R.string.msg_kc_public), + MSG_KC_SECRET (LogLevel.START, R.string.msg_kc_secret), MSG_KC_ERROR_V3 (LogLevel.ERROR, R.string.msg_kc_error_v3), MSG_KC_ERROR_NO_UID (LogLevel.ERROR, R.string.msg_kc_error_no_uid), MSG_KC_ERROR_MASTER_ALGO (LogLevel.ERROR, R.string.msg_kc_error_master_algo), diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 9ce1d0868..3f5e88091 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -638,8 +638,8 @@ <string name="msg_ip_master_flags_xxsx">"Master flags: sign"</string> <string name="msg_ip_master_flags_xxxa">"Master flags: authenticate"</string> <string name="msg_ip_master_flags_xxxx">"Master flags: none"</string> - <string name="msg_ip_merge_public">"Merging new data into public keyring"</string> - <string name="msg_ip_merge_secret">"Merging new data into secret keyring"</string> + <string name="msg_ip_merge_public">"Merging imported data into existing public keyring"</string> + <string name="msg_ip_merge_secret">"Merging imported data into existing public keyring"</string> <string name="msg_ip_subkey">"Processing subkey %s"</string> <string name="msg_ip_subkey_expired">"Subkey expired on %s"</string> <string name="msg_ip_subkey_expires">"Subkey expires on %s"</string> @@ -690,8 +690,8 @@ <string name="msg_is_db_exception">"Database error!"</string> <string name="msg_is_importing_subkeys">"Processing secret subkeys"</string> <string name="msg_is_error_io_exc">"Error encoding keyring"</string> - <string name="msg_is_merge_public">"Merging new data into public keyring"</string> - <string name="msg_is_merge_secret">"Merging new data into secret keyring"</string> + <string name="msg_is_merge_public">"Merging imported data into existing public keyring"</string> + <string name="msg_is_merge_secret">"Merging imported data into existing public keyring"</string> <string name="msg_is_pubring_generate">"Generating public keyring from secret keyring"</string> <string name="msg_is_subkey_nonexistent">"Subkey %s unavailable in secret key"</string> <string name="msg_is_subkey_ok">"Marked secret subkey %s as available"</string> @@ -1023,7 +1023,7 @@ <string name="empty_certs">"No certificates for this key"</string> <string name="certs_text">"Only validated self-certificates and validated certificates created with your keys are displayed here."</string> <string name="section_uids_to_certify">"Identities for "</string> - <string name="certify_text">"The keys you’re importing contain “identities”: names and emails. If these match what you expected, you can say so by “certifying” them. If they don’t match, you probably shouldn’t use these keys."</string> + <string name="certify_text">"The keys you are importing contain “identities”: names and emails. Select exactly those for certification which match what you expected."</string> <string name="label_revocation">"Revocation Reason"</string> <string name="label_verify_status">"Verification Status"</string> <string name="label_cert_type">"Type"</string> |