diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-18 13:43:18 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-18 14:02:21 +0200 |
| commit | f80228a08dbb6c9cfa350f9f9f71d76ff8f313c2 (patch) | |
| tree | 47448e0d4c56d1f765283bf98394a2d21d8d74e9 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
| parent | 1e45e5cd9ad4e38bcff347bc7d3b8f422a636519 (diff) | |
| download | open-keychain-f80228a08dbb6c9cfa350f9f9f71d76ff8f313c2.tar.gz open-keychain-f80228a08dbb6c9cfa350f9f9f71d76ff8f313c2.tar.bz2 open-keychain-f80228a08dbb6c9cfa350f9f9f71d76ff8f313c2.zip | |
consolidate: make it work
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java index 408715fdf..4010ab108 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java @@ -222,12 +222,12 @@ public class OperationResultParcel implements Parcelable { MSG_KC_UID_REVOKE_OLD (R.string.msg_kc_uid_revoke_old), // keyring consolidation - MSG_KO (R.string.msg_ko), - MSG_KO_FATAL_ENCODE (R.string.msg_ko_fatal_encode), - MSG_KO_HETEROGENEOUS (R.string.msg_ko_heterogeneous), - MSG_KO_MERGING (R.string.msg_ko_merging), - MSG_KO_NEW_SUBKEY (R.string.msg_ko_new_subkey), - MSG_KO_FOUND_NEW (R.string.msg_ko_found_new), + MSG_MG_PUBLIC (R.string.msg_mg_public), + MSG_MG_SECRET (R.string.msg_mg_secret), + MSG_MG_FATAL_ENCODE (R.string.msg_mg_fatal_encode), + MSG_MG_HETEROGENEOUS (R.string.msg_mg_heterogeneous), + MSG_MG_NEW_SUBKEY (R.string.msg_mg_new_subkey), + MSG_MG_FOUND_NEW (R.string.msg_mg_found_new), ; private final int mMsgId; |