From c3f0503a916514dd6c95e249905cea7bc8103b9a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 15 Feb 2016 12:35:35 +0100
Subject: pulled translations from transifex

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

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

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index a133606f..7214d5fc 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -240,6 +240,7 @@
   <string name="you">你</string>
   <string name="action_edit_subject">编辑讨论组主题</string>
   <string name="conference_not_found">讨论组未找到</string>
+  <string name="conference_unknown_error">收到未知错误</string>
   <string name="leave">离开</string>
   <string name="contact_added_you">联系人已添加你到联系人列表</string>
   <string name="add_back">反向添加</string>
@@ -297,6 +298,8 @@
   <string name="pref_expert_options_other">其他</string>
   <string name="pref_conference_name">讨论组名称</string>
   <string name="pref_conference_name_summary">用讨论组的主题来标示讨论组而不是 JID</string>
+  <string name="pref_autojoin">自动加入讨论组</string>
+  <string name="pref_autojoin_summary">将讨论组加入到自动加入书签</string>
   <string name="toast_message_otr_fingerprint">OTR 指纹已拷贝到剪贴板！</string>
   <string name="toast_message_omemo_fingerprint">OMEMO 指纹已拷贝到剪贴板！</string>
   <string name="conference_banned">你被此讨论组屏蔽</string>
@@ -494,9 +497,15 @@
   <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_show_connection_options">扩展的连接选项</string>
+  <string name="pref_show_connection_options_summary">设置账户时显示主机名和端口选项</string>
+  <string name="hostname_example">xmpp.example.com</string>
   <string name="action_add_account_with_certificate">使用证书添加账户</string>
   <string name="unable_to_parse_certificate">无法解析证书</string>
   <string name="authenticate_with_certificate">留空以认证 w/ 证书</string>
+  <string name="mam_prefs">正在存档配置</string>
+  <string name="fetching_mam_prefs">正在获取存档配置。请稍后...</string>
+  <string name="unable_to_fetch_mam_prefs">无法获取存档的配置</string>
   <string name="captcha_ocr">验证码</string>
   <string name="captcha_required">需要验证码</string>
   <string name="captcha_hint">输入图片中的文字</string>
@@ -518,6 +527,7 @@
   <plurals name="x_messages">
     <item quantity="other">%d 条消息</item>
   </plurals>
+  <string name="load_more_messages">载入更多消息</string>
   <string name="shared_file_with_x">用 %s 分享文件</string>
   <string name="shared_image_with_x">用 %s 分享图片</string>
   <string name="no_storage_permission">Conversations 需要访问外部存储</string>
@@ -546,4 +556,6 @@
 你将会被提示禁用该功能。</string>
   <string name="disable">禁用</string>
   <string name="selection_too_large">选择区域过大</string>
+  <string name="no_accounts">(没有激活的账户)</string>
+  <string name="this_field_is_required">必填</string>
 </resources>
-- 
cgit v1.2.3