diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-02 15:11:13 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-02 15:11:13 +0200 |
commit | a66c6b5b7ab55d7da2bdebdc4526b4293b507d40 (patch) | |
tree | 9622cff1cbd8a1e45e03e9ced1fcfb6099073fd4 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
parent | bb39caa28d5138adaf936fbfe18d8db05f5de31c (diff) | |
parent | 144a10a3d043686755651852419c5a8bc6619f2a (diff) | |
download | open-keychain-a66c6b5b7ab55d7da2bdebdc4526b4293b507d40.tar.gz open-keychain-a66c6b5b7ab55d7da2bdebdc4526b4293b507d40.tar.bz2 open-keychain-a66c6b5b7ab55d7da2bdebdc4526b4293b507d40.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
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 7f91ab490..575180505 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java @@ -165,6 +165,7 @@ public class OperationResultParcel implements Parcelable { MSG_IP_UID_CERT_ERROR (R.string.msg_ip_uid_cert_error), MSG_IP_UID_CERT_GOOD (R.string.msg_ip_uid_cert_good), MSG_IP_UID_CERTS_UNKNOWN (R.plurals.msg_ip_uid_certs_unknown), + MSG_IP_UID_CLASSIFYING_ZERO (R.string.msg_ip_uid_classifying_zero), MSG_IP_UID_CLASSIFYING (R.plurals.msg_ip_uid_classifying), MSG_IP_UID_REORDER(R.string.msg_ip_uid_reorder), MSG_IP_UID_PROCESSING (R.string.msg_ip_uid_processing), |