From e482fe18fe9f61575dae191aa3fc5d3819962786 Mon Sep 17 00:00:00 2001
From: Daniel Hammann <github@honnel.de>
Date: Wed, 5 Mar 2014 17:44:55 +0100
Subject: =?UTF-8?q?Lint=20Issue:=20TypographyEllipsis:=20Ellipsis=20string?=
 =?UTF-8?q?=20can=20be=20replaced=20with=20ellipsis=20character=20Replace?=
 =?UTF-8?q?=20"..."=20with=20ellipsis=20character=20(=E2=80=A6,=20&#8230;)?=
 =?UTF-8?q?=20...=20->=20=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenPGP-Keychain/src/main/res/values-zh/strings.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'OpenPGP-Keychain/src/main/res/values-zh/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
index f9422b64b..5848fb8db 100644
--- a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
@@ -24,7 +24,7 @@
   <string name="menu_copy_to_clipboard">复制到剪贴板</string>
   <string name="menu_sign_key">签署密钥</string>
   <string name="menu_key_edit_cancel">取消</string>
-  <string name="menu_encrypt_to">加密到...</string>
+  <string name="menu_encrypt_to">加密到…</string>
   <!--label-->
   <string name="label_sign">签署</string>
   <string name="label_message">讯息</string>
@@ -64,7 +64,7 @@
   <string name="choice_4hours">4小时</string>
   <string name="choice_8hours">8小时</string>
   <string name="choice_forever">永远</string>
-  <string name="filemanager_title_open">打开...</string>
+  <string name="filemanager_title_open">打开…</string>
   <string name="warning">警告</string>
   <string name="error">错误</string>
   <!--sentences-->
@@ -106,13 +106,13 @@
   <string name="error_wrong_passphrase">错误的密语</string>
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">完成。</string>
-  <string name="progress_saving">保存...</string>
-  <string name="progress_importing">导入中...</string>
-  <string name="progress_exporting">导出中...</string>
+  <string name="progress_saving">保存…</string>
+  <string name="progress_importing">导入中…</string>
+  <string name="progress_exporting">导出中…</string>
   <string name="progress_building_key">建立密钥</string>
   <string name="progress_preparing_master_key">正在准备主密钥</string>
-  <string name="progress_verifying_signature">正在验证签名...</string>
-  <string name="progress_signing">正在签名...</string>
+  <string name="progress_verifying_signature">正在验证签名…</string>
+  <string name="progress_signing">正在签名…</string>
   <string name="progress_reading_data">正在读取数据</string>
   <string name="progress_finding_key">正在查找密钥</string>
   <string name="progress_querying">正在查询</string>
-- 
cgit v1.2.3


From d339029ab9b73459737c5d6409bf35c4715d0eac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 10 Mar 2014 22:40:59 +0100
Subject: Pull from transifex

---
 .../src/main/res/values-zh/strings.xml             | 44 ++++++++++++++++++----
 1 file changed, 37 insertions(+), 7 deletions(-)

(limited to 'OpenPGP-Keychain/src/main/res/values-zh/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
index 5848fb8db..80413d589 100644
--- a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
@@ -1,17 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--title-->
+  <string name="title_select_recipients">选择公钥</string>
+  <string name="title_select_secret_key">选择私钥</string>
   <string name="title_encrypt">加密</string>
   <string name="title_decrypt">解密</string>
+  <string name="title_authentication">密码短语</string>
+  <string name="title_create_key">创建密钥</string>
+  <string name="title_edit_key">编辑密钥</string>
+  <string name="title_preferences">参数</string>
+  <string name="title_api_registered_apps">已注册应用</string>
   <string name="title_key_server_preference">密钥服务器偏好</string>
+  <string name="title_set_passphrase">设置密码短语</string>
+  <string name="title_send_email">发送邮件</string>
+  <string name="title_encrypt_to_file">加密至文件</string>
+  <string name="title_decrypt_to_file">解密至文件</string>
+  <string name="title_import_keys">导入密钥</string>
+  <string name="title_export_key">导出密钥</string>
+  <string name="title_export_keys">导出密钥</string>
+  <string name="title_key_not_found">无法找到密钥</string>
   <string name="title_key_server_query">查询密钥服务器</string>
   <string name="title_send_key">上传到密钥服务器</string>
+  <string name="title_unknown_signature_key">未知签名密钥</string>
+  <string name="title_help">帮助</string>
   <!--section-->
+  <string name="section_user_ids">用户ID</string>
+  <string name="section_keys">密钥</string>
+  <string name="section_general">常规</string>
+  <string name="section_defaults">缺省</string>
+  <string name="section_advanced">高级</string>
   <string name="section_master_key">主密钥</string>
   <string name="section_key_server">密钥服务器</string>
   <string name="section_decrypt_verify">解密并验证</string>
   <!--button-->
+  <string name="btn_sign">签名</string>
+  <string name="btn_decrypt">解密</string>
   <string name="btn_decrypt_verify">解密并验证</string>
+  <string name="btn_select_encrypt_keys">选择收件人</string>
+  <string name="btn_encrypt_file">加密文件</string>
+  <string name="btn_save">保存</string>
+  <string name="btn_do_not_save">取消</string>
+  <string name="btn_delete">删除</string>
+  <string name="btn_no_date">无</string>
   <string name="btn_clipboard">剪贴板</string>
   <!--menu-->
   <string name="menu_help">帮助</string>
@@ -24,7 +54,7 @@
   <string name="menu_copy_to_clipboard">复制到剪贴板</string>
   <string name="menu_sign_key">签署密钥</string>
   <string name="menu_key_edit_cancel">取消</string>
-  <string name="menu_encrypt_to">加密到…</string>
+  <string name="menu_encrypt_to">加密到...</string>
   <!--label-->
   <string name="label_sign">签署</string>
   <string name="label_message">讯息</string>
@@ -64,7 +94,7 @@
   <string name="choice_4hours">4小时</string>
   <string name="choice_8hours">8小时</string>
   <string name="choice_forever">永远</string>
-  <string name="filemanager_title_open">打开…</string>
+  <string name="filemanager_title_open">打开...</string>
   <string name="warning">警告</string>
   <string name="error">错误</string>
   <!--sentences-->
@@ -106,13 +136,13 @@
   <string name="error_wrong_passphrase">错误的密语</string>
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">完成。</string>
-  <string name="progress_saving">保存…</string>
-  <string name="progress_importing">导入中…</string>
-  <string name="progress_exporting">导出中…</string>
+  <string name="progress_saving">保存...</string>
+  <string name="progress_importing">导入中...</string>
+  <string name="progress_exporting">导出中...</string>
   <string name="progress_building_key">建立密钥</string>
   <string name="progress_preparing_master_key">正在准备主密钥</string>
-  <string name="progress_verifying_signature">正在验证签名…</string>
-  <string name="progress_signing">正在签名…</string>
+  <string name="progress_verifying_signature">正在验证签名...</string>
+  <string name="progress_signing">正在签名...</string>
   <string name="progress_reading_data">正在读取数据</string>
   <string name="progress_finding_key">正在查找密钥</string>
   <string name="progress_querying">正在查询</string>
-- 
cgit v1.2.3