From 24aefa109c1f4d673e826c83720233651a850467 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 6 Mar 2016 21:35:59 +0100
Subject: pulled translations from transifex

---
 src/main/res/values-zh-rCN/strings.xml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 5ed64ed5..8c770537 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -96,7 +96,6 @@
   <string name="contact_has_no_pgp_key">Conversations 无法加密信息，因为联系人未提供他/她的公钥。\n\n<small>请通知联系人设置 OpenPGP。</small></string>
   <string name="no_pgp_keys">未找到 OpenPGP 密钥</string>
   <string name="contacts_have_no_pgp_keys">因您的联系人未公布公钥，Conversations未能成功加密您的信息.\n\n<small>请通知联系人设置OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>接收到加密消息。轻触以解密。</i></string>
   <string name="pref_general">常规</string>
   <string name="pref_xmpp_resource">XMPP 资源</string>
   <string name="pref_xmpp_resource_summary">客户端标识名称</string>
@@ -240,8 +239,7 @@
   <string name="bookmark_already_exists">该书签已存在</string>
   <string name="you">你</string>
   <string name="action_edit_subject">编辑讨论组主题</string>
-  <string name="conference_not_found">讨论组未找到</string>
-  <string name="conference_unknown_error">收到未知错误</string>
+  <string name="joining_conference">加入讨论组…</string>
   <string name="leave">离开</string>
   <string name="contact_added_you">联系人已添加你到联系人列表</string>
   <string name="add_back">反向添加</string>
@@ -308,10 +306,13 @@
   <string name="conference_banned">你被此讨论组屏蔽</string>
   <string name="conference_members_only">此讨论组只允许成员加入</string>
   <string name="conference_kicked">你被从此讨论组踢出</string>
+  <string name="conference_shutdown">讨论组已被关闭</string>
+  <string name="conference_unknown_error">你已不属于此讨论组</string>
   <string name="using_account">用账户  %s</string>
   <string name="checking_x">正在 HTTP 服务器中检查 %s</string>
   <string name="not_connected_try_again">你没有连接。请稍后重试</string>
   <string name="check_x_filesize">检查 %s 大小</string>
+  <string name="check_x_filesize_on_host">在 %2$s 上检查 %1$s 的大小</string>
   <string name="message_options">消息选项</string>
   <string name="copy_text">拷贝文本</string>
   <string name="copy_original_url">拷贝原始URL</string>
@@ -488,6 +489,8 @@
   <string name="username">用户名</string>
   <string name="username_hint">用户名</string>
   <string name="invalid_username">该用户名无效</string>
+  <string name="conference_name">讨论组名称</string>
+  <string name="invalid_conference_name">该讨论组名称无效</string>
   <string name="download_failed_server_not_found">下载失败：未找到服务器</string>
   <string name="download_failed_file_not_found">下载失败：未找到文件</string>
   <string name="download_failed_could_not_connect">下载失败：无法连接到服务器</string>
@@ -500,6 +503,8 @@
   <string name="pref_away_when_screen_off_summary">当屏幕关闭时将标记您的资源为离开状态</string>
   <string name="pref_xa_on_silent_mode">静音模式时不可用</string>
   <string name="pref_xa_on_silent_mode_summary">当设备进入静音模式时把资源标识改为不可用</string>
+  <string name="pref_treat_vibrate_as_silent">静音模式开启振动</string>
+  <string name="pref_treat_vibrate_as_silent_summary">当设备进入振动模式时把资源标识改为不可用</string>
   <string name="pref_show_connection_options">高级边接设置</string>
   <string name="pref_show_connection_options_summary">注册账户时显示主机名和端口</string>
   <string name="hostname_example">xmpp.example.com</string>
@@ -564,4 +569,7 @@
   <string name="this_field_is_required">必填</string>
   <string name="correct_message">更正消息</string>
   <string name="send_corrected_message">发送更正后的消息</string>
+  <string name="no_keys_just_confirm">你已信任此联系人。选择“完成”表示 %s 将成为此讨论组的一部分。</string>
+  <string name="select_image_and_crop">选择照片并裁剪</string>
+  <string name="this_account_is_disabled">你已经禁用了此账户</string>
 </resources>
-- 
cgit v1.2.3