From fe2c17cdeb59ebd65391bf92dc8afb20431ce824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 2 Sep 2014 14:11:10 +0200
Subject: Pull from transifex

---
 OpenKeychain/src/main/res/values-zh/strings.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res/values-zh')

diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml
index 9d0848c07..4080e438e 100644
--- a/OpenKeychain/src/main/res/values-zh/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--title-->
-  <string name="title_encrypt">加密</string>
   <string name="title_decrypt">解密</string>
   <string name="title_authentication">密码短语</string>
   <string name="title_edit_key">编辑密钥</string>
@@ -105,6 +104,11 @@
   <string name="key_size_1024">1024</string>
   <string name="key_size_2048">2048</string>
   <string name="key_size_4096">4096</string>
+  <!--elliptic curve names-->
+  <!--not in for now, see SaveKeyringParcel
+    <string name="key_curve_bp_p256">Brainpool P-256</string>
+    <string name="key_curve_bp_p384">Brainpool P-384</string>
+    <string name="key_curve_bp_p512">Brainpool P-512</string>-->
   <!--compression-->
   <string name="compression_fast">快</string>
   <string name="compression_very_slow">非常慢</string>
@@ -138,6 +142,7 @@
   <!--Navigation Drawer-->
   <!--hints-->
   <!--certs-->
+  <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
   <!--Import Public log entries-->
   <!--Import Secret log entries-->
   <!--Keyring Canonicalization log entries-->
-- 
cgit v1.2.3