diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-15 14:00:17 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-15 14:00:17 +0200 |
commit | e457d4c9097cb3f2e1c6305609cfacff1c5c38c2 (patch) | |
tree | 9d6410b554b68aca6aa49539e045e9db5d703cbf /OpenKeychain/src/main/res/values-zh | |
parent | 9a3a032d99064cd16ca065a214d8f7fd09d54088 (diff) | |
parent | 40751bceb586d12da671966c1ad5661223819c5b (diff) | |
download | open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.tar.gz open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.tar.bz2 open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.zip |
Merge remote-tracking branch 'origin/master'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
OpenKeychain/src/main/res/values-de/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/values-zh')
-rw-r--r-- | OpenKeychain/src/main/res/values-zh/strings.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml index d058cb99e..578c13ed8 100644 --- a/OpenKeychain/src/main/res/values-zh/strings.xml +++ b/OpenKeychain/src/main/res/values-zh/strings.xml @@ -72,7 +72,6 @@ <string name="select_encryption_or_signature_key">选择至少一个加密密钥或者签名密钥</string> <string name="key_exported">成功地导出了1个密钥</string> <string name="no_keys_exported">没有密钥被导出</string> - <string name="key_send_success">成功地上传了密钥到服务器</string> <string name="list_empty">这个列表是空的!</string> <!--errors no punctuation, all lowercase, @@ -148,6 +147,9 @@ <!--createSecretKeyRing--> <!--modifySecretKeyRing--> <!--Consolidate--> + <!--Other messages used in OperationLogs--> + <!--Messages for DecryptVerify operation--> + <!--Messages for SignEncrypt operation--> <!--PassphraseCache--> <!--unsorted--> <!--First Time--> |