aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-08-27 15:42:09 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-08-27 15:42:09 +0200
commitcb2eb8aca2e7aab6243fd3e1a3313c941e3f1998 (patch)
treead9ea6a131d75eb0a255c628cdd813d585b24489 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
parent12a5b2174f79d93e8531fa4e0b3fc0def3796ca9 (diff)
downloadopen-keychain-cb2eb8aca2e7aab6243fd3e1a3313c941e3f1998.tar.gz
open-keychain-cb2eb8aca2e7aab6243fd3e1a3313c941e3f1998.tar.bz2
open-keychain-cb2eb8aca2e7aab6243fd3e1a3313c941e3f1998.zip
small language fixes for previous commit
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java6
1 files changed, 3 insertions, 3 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 ddc456e34..72cac4856 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
@@ -332,14 +332,14 @@ public class OperationResultParcel implements Parcelable {
// keyring consolidation
+ MSG_MG_ERROR_SECRET_DUMMY(R.string.msg_mg_error_secret_dummy),
+ MSG_MG_ERROR_ENCODE(R.string.msg_mg_error_encode),
+ MSG_MG_ERROR_HETEROGENEOUS(R.string.msg_mg_error_heterogeneous),
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),
MSG_MG_UNCHANGED (R.string.msg_mg_unchanged),
- MSG_MG_NO_SECRET_KEYRING (R.string.msg_mg_no_secret_keyring),
// secret key create
MSG_CR (R.string.msg_cr),