diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-06-19 13:57:35 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-06-19 13:57:35 +0200 |
| commit | 58706425d62e40c0ecc9164a8fee089ca471e1fe (patch) | |
| tree | d250292332dce208760847f150c4e627607d8028 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
| parent | d9c937bbe762736d9f0c45d5ba0083555c8da2e1 (diff) | |
| parent | 48c96184dcf2837f9be2e5bdb116bedd86098eb3 (diff) | |
| download | open-keychain-58706425d62e40c0ecc9164a8fee089ca471e1fe.tar.gz open-keychain-58706425d62e40c0ecc9164a8fee089ca471e1fe.tar.bz2 open-keychain-58706425d62e40c0ecc9164a8fee089ca471e1fe.zip | |
Merge branch 'master' of https://github.com/open-keychain/open-keychain into improve-file
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java | 1 |
1 files changed, 1 insertions, 0 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 6e49baf92..f88df5301 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java @@ -201,6 +201,7 @@ public class OperationResultParcel implements Parcelable { MSG_KC_SUB_BAD_KEYID(R.string.msg_kc_sub_bad_keyid), MSG_KC_SUB_BAD_TIME(R.string.msg_kc_sub_bad_time), MSG_KC_SUB_BAD_TYPE(R.string.msg_kc_sub_bad_type), + MSG_KC_SUB_DUP (R.string.msg_kc_sub_dup), MSG_KC_SUB_PRIMARY_BAD(R.string.msg_kc_sub_primary_bad), MSG_KC_SUB_PRIMARY_BAD_ERR(R.string.msg_kc_sub_primary_bad_err), MSG_KC_SUB_PRIMARY_NONE(R.string.msg_kc_sub_primary_none), |