Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4

Conflicts:
	README.md
	art/render.rb
	build.gradle
	src/main/java/eu/siacs/conversations/Config.java
	src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
	src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
	src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java
	src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java
	src/main/java/eu/siacs/conversations/entities/Bookmark.java
	src/main/java/eu/siacs/conversations/entities/Contact.java
	src/main/java/eu/siacs/conversations/entities/ListItem.java
	src/main/java/eu/siacs/conversations/entities/Message.java
	src/main/java/eu/siacs/conversations/parser/IqParser.java
	src/main/java/eu/siacs/conversations/parser/PresenceParser.java
	src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
	src/main/java/eu/siacs/conversations/persistance/FileBackend.java
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
	src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
	src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
	src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
	src/main/java/eu/siacs/conversations/ui/XmppActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
	src/main/java/eu/siacs/conversations/utils/DNSHelper.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
	src/main/res/layout/activity_contact_details.xml
	src/main/res/layout/message_received.xml
	src/main/res/layout/message_sent.xml
	src/main/res/values-bg/strings.xml
	src/main/res/values-de/strings.xml
	src/main/res/values-es/strings.xml
	src/main/res/values-eu/strings.xml
	src/main/res/values-fr/strings.xml
	src/main/res/values-ja/strings.xml
	src/main/res/values-nl/strings.xml
	src/main/res/values-pt-rBR/strings.xml
	src/main/res/values-pt/strings.xml
	src/main/res/values-ro-rRO/strings.xml
	src/main/res/values-sr/strings.xml
	src/main/res/values-sv/strings.xml
	src/main/res/values-tr-rTR/strings.xml

1 files changed, 29 insertions, 0 deletions

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 4c846c8f..b12ca2b9 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -103,10 +103,18 @@
   <string name="pref_xmpp_resource_summary">客户端标识名称</string>
   <string name="pref_accept_files">接收文件</string>
   <string name="pref_accept_files_summary">自动接收小于 … 的文件</string>
+  <string name="pref_attachments">附件</string>
+  <string name="pref_return_to_previous">快速分享</string>
+  <string name="pref_return_to_previous_summary">分享后立即回到之前活动的应用程序，而非打开会话</string>
   <string name="pref_notification_settings">通知</string>
   <string name="pref_notifications">通知</string>
   <string name="pref_notifications_summary">收到新消息时通知</string>
   <string name="pref_vibrate">震动</string>
+  <string name="pref_vibrate_summary">收到新消息时震动</string>
+  <string name="pref_led">LED 灯提示</string>
+  <string name="pref_led_summary">收到新消息时闪烁通知灯</string>
+  <string name="pref_sound">铃声</string>
+  <string name="pref_sound_summary">收到新消息时响铃</string>
   <string name="pref_notification_grace_period">通知限期</string>
   <string name="pref_notification_grace_period_summary">接收副本短时间内关闭通知</string>
   <string name="pref_advanced_options">高级</string>
@@ -536,6 +544,7 @@
   <string name="shared_file_with_x">用 %s 分享文件</string>
   <string name="shared_image_with_x">用 %s 分享图片</string>
   <string name="shared_images_with_x">图片分享自 %s</string>
+  <string name="shared_text_with_x">用 %s 分享文本</string>
   <string name="no_storage_permission">Conversations 需要访问外部存储</string>
   <string name="sync_with_contacts">与联系人同步</string>
   <string name="sync_with_contacts_long">Conversations 会匹配你的 XMPP 花名册与你的联系人，以显示他们的全名和头像。\n\nConversations 只会读取你的联系人并在本地匹配，不会上传到你的服务器。\n\n现在将要询问你是否给予访问你联系人的权限。</string>
@@ -565,4 +574,24 @@
   <string name="no_keys_just_confirm">你已信任此联系人。选择“完成”表示 %s 将成为此讨论组的一部分。</string>
   <string name="select_image_and_crop">选择照片并裁剪</string>
   <string name="this_account_is_disabled">你已经禁用了此账户</string>
+  <string name="security_error_invalid_file_access">安全错误：文件访问权限无效</string>
+  <string name="no_application_to_share_uri">没有可以分享此链接的应用</string>
+  <string name="share_uri_with">分享链接...</string>
+  <string name="welcome_text">XMPP 是一种独立于服务端的协议。你可以选择任何 XMPP 服务器来使用本客户端。\n当然为了方便您的使用，我们可以为您在 conversations.im ——一个特别为 Conversations 设计的服务端——上创建一个账户。</string>
+  <string name="magic_create_text">我们将指导您在 conversations.im 上创建一个账户。\n当您选择 conversations.im 作为服务端后，您将可以通过提供您完整的 Jabber ID 来与他人进行会话。</string>
+  <string name="your_full_jid_will_be">您完整的 Jabble ID 是：%s </string>
+  <string name="create_account">创建账户</string>
+  <string name="use_own_provider">使用我自己的服务端</string>
+  <string name="pick_your_username">输入您的用户名</string>
+  <string name="pref_manually_change_presence">手动更改状态</string>
+  <string name="pref_manually_change_presence_summary">点击你的头像来变更你的状态</string>
+  <string name="change_presence">变更状态</string>
+  <string name="status_message">状态信息</string>
+  <string name="all_accounts_on_this_device">为本设备上的所有帐户设置</string>
+  <string name="presence_chat">免费聊天室</string>
+  <string name="presence_online">在线</string>
+  <string name="presence_away">离开</string>
+  <string name="presence_xa">离线</string>
+  <string name="presence_dnd">忙碌</string>
+  <string name="secure_password_generated">安全密码已生成</string>
 </resources>