diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-25 02:59:28 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-25 03:18:54 +0200 |
| commit | ce4b8edaabf4f0781234e1975e0b96bbada28fb7 (patch) | |
| tree | ffcb6dbfacec8848f556dcedb655270fd4f90c13 /OpenKeychain | |
| parent | d3e0e823e3774832f13ea34861252534eec9896b (diff) | |
| download | open-keychain-ce4b8edaabf4f0781234e1975e0b96bbada28fb7.tar.gz open-keychain-ce4b8edaabf4f0781234e1975e0b96bbada28fb7.tar.bz2 open-keychain-ce4b8edaabf4f0781234e1975e0b96bbada28fb7.zip | |
more rewording
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 | 8 |
2 files changed, 6 insertions, 6 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..ea2aac0c6 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> |