Merge branch 'development' into linked-identities

Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java

1 files changed, 0 insertions, 14 deletions

diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml
index 86059840a..f43cb3ebd 100644
--- a/OpenKeychain/src/main/res/values-zh/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh/strings.xml
@@ -4,13 +4,10 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">选择密钥</string>
-  <string name="title_select_secret_key">选择私钥</string>
   <string name="title_decrypt">解密</string>
   <string name="title_add_subkey">添加子密钥</string>
   <string name="title_edit_key">编辑密钥</string>
   <string name="title_preferences">设置</string>
-  <string name="title_cloud_search_preferences">云搜索设置</string>
   <string name="title_api_registered_apps">已注册应用</string>
   <string name="title_key_server_preference">密钥服务器</string>
   <string name="title_change_passphrase">变更密码</string>
@@ -21,7 +18,6 @@
   <string name="title_encrypt_to_file">加密至文件</string>
   <string name="title_decrypt_to_file">解密至文件</string>
   <string name="title_import_keys">导入密钥</string>
-  <string name="title_add_keys">添加密钥</string>
   <string name="title_export_key">导出密钥</string>
   <string name="title_export_keys">导出密钥</string>
   <string name="title_key_not_found">无法找到密钥</string>
@@ -30,27 +26,19 @@
   <string name="title_key_details">密钥详情</string>
   <string name="title_help">帮助</string>
   <string name="title_log_display">日志</string>
-  <string name="title_create_key">创建密钥</string>
   <string name="title_advanced_key_info">更多密钥详情</string>
-  <string name="title_keys">密钥</string>
   <string name="title_export_log">导出日志</string>
   <!--section-->
   <string name="section_user_ids">用户名</string>
   <string name="section_should_you_trust">应该相信此密钥?</string>
   <string name="section_keys">子密钥</string>
   <string name="section_cloud_search">在线搜索</string>
-  <string name="section_general">常规</string>
-  <string name="section_defaults">缺省</string>
-  <string name="section_advanced">高级</string>
   <string name="section_passphrase_cache">密语缓存</string>
   <string name="section_certify">确认</string>
   <string name="section_key_server">密钥服务器</string>
   <string name="section_fingerprint">签名</string>
-  <string name="section_decrypt_files">解密文件</string>
-  <string name="section_decrypt_text">解密文本</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">解密并验证文件</string>
-  <string name="btn_encrypt_file">加密文件</string>
   <string name="btn_encrypt_share_file">加密并分享文件</string>
   <string name="btn_save">保存</string>
   <string name="btn_do_not_save">取消</string>
@@ -73,10 +61,8 @@
   <string name="menu_delete_key">删除密钥</string>
   <string name="menu_search">搜索</string>
   <string name="menu_beam_preferences">参数</string>
-  <string name="menu_key_edit_cancel">取消</string>
   <string name="menu_encrypt_to">加密到...</string>
   <string name="menu_select_all">选择全部</string>
-  <string name="menu_add_keys">添加密钥</string>
   <string name="menu_export_all_keys">导出全部密钥</string>
   <string name="menu_advanced">高级</string>
   <!--label-->