From 4f2d20dbd577365a682eb1c3fcbe3200ea096147 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Tue, 18 Feb 2020 21:41:44 +0100
Subject: New translations strings.xml (Chinese Simplified)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index eeaeffd4f..2e0650222 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,6 +84,7 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
+    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -143,6 +144,9 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -154,6 +158,7 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
+    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -210,7 +215,6 @@
     <string name="channel_bare_jid_example">群聊@conference.example.com</string>
     <string name="save_as_bookmark">保存为书签</string>
     <string name="delete_bookmark">删除书签</string>
-    <string name="bookmark_already_exists">此书签已存在</string>
     <string name="topic">主题</string>
     <string name="joining_conference">加入群聊…</string>
     <string name="leave">离开</string>
@@ -303,6 +307,7 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
+    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -441,6 +446,7 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
+    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -478,11 +484,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">极低（144p）</string>
+    <string name="video_very_low">非常低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件(未压缩)</string>
+    <string name="video_original">原文件（未压缩）</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -505,7 +511,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -637,10 +643,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低(720p)</string>
-    <string name="image_mid">标准(1920p)</string>
-    <string name="image_high">高 (3840p)</string>
-    <string name="image_original">原版(未压缩)</string>
+    <string name="image_low">低（720p）</string>
+    <string name="image_mid">中（1920p）</string>
+    <string name="image_high">高（3840p）</string>
+    <string name="image_original">原文件（未压缩）</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -650,7 +656,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录视频</string>
+    <string name="action_take_video">录像</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -684,7 +690,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -734,6 +740,7 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
+    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -748,7 +755,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
+    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -828,6 +835,9 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
+    <plurals name="view_users">
+        <item quantity="other">查看 %1$d 名参与者</item>
+    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -882,7 +892,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">寻找更新</string>
+    <string name="pref_use_internal_updater">查找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -915,6 +925,8 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
+    <string name="x_has_written">%s 写道：</string>
+    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -953,6 +965,7 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
+    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -964,4 +977,6 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
+    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
+    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From defb4c7044e11c8c2bf17730380a7be070d3be0d Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Tue, 18 Feb 2020 21:42:20 +0100
Subject: New translations strings.xml (Chinese Traditional)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 2e0650222..30f357639 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,7 +84,6 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
-    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -144,9 +143,6 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -158,7 +154,6 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
-    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -307,7 +302,6 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
-    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -446,7 +440,6 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
-    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -484,11 +477,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">非常低（144p）</string>
+    <string name="video_very_low">极低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件（未压缩）</string>
+    <string name="video_original">原文件(未压缩)</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -511,7 +504,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -643,10 +636,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低（720p）</string>
-    <string name="image_mid">中（1920p）</string>
-    <string name="image_high">高（3840p）</string>
-    <string name="image_original">原文件（未压缩）</string>
+    <string name="image_low">低(720p)</string>
+    <string name="image_mid">标准(1920p)</string>
+    <string name="image_high">高 (3840p)</string>
+    <string name="image_original">原版(未压缩)</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -656,7 +649,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录像</string>
+    <string name="action_take_video">录视频</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -690,7 +683,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -740,7 +733,6 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
-    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -755,7 +747,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
+    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -835,9 +827,6 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
-    <plurals name="view_users">
-        <item quantity="other">查看 %1$d 名参与者</item>
-    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -892,7 +881,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">查找更新</string>
+    <string name="pref_use_internal_updater">寻找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -925,8 +914,6 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
-    <string name="x_has_written">%s 写道：</string>
-    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -965,7 +952,6 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
-    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -977,6 +963,4 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
-    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
-    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From 83ac39ff73ea7c7657e48ad0292b422b7591eb29 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Wed, 19 Feb 2020 21:42:17 +0100
Subject: New translations strings.xml (Chinese Simplified)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 30f357639..2e0650222 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,6 +84,7 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
+    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -143,6 +144,9 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -154,6 +158,7 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
+    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -302,6 +307,7 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
+    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -440,6 +446,7 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
+    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -477,11 +484,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">极低（144p）</string>
+    <string name="video_very_low">非常低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件(未压缩)</string>
+    <string name="video_original">原文件（未压缩）</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -504,7 +511,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -636,10 +643,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低(720p)</string>
-    <string name="image_mid">标准(1920p)</string>
-    <string name="image_high">高 (3840p)</string>
-    <string name="image_original">原版(未压缩)</string>
+    <string name="image_low">低（720p）</string>
+    <string name="image_mid">中（1920p）</string>
+    <string name="image_high">高（3840p）</string>
+    <string name="image_original">原文件（未压缩）</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -649,7 +656,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录视频</string>
+    <string name="action_take_video">录像</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -683,7 +690,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -733,6 +740,7 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
+    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -747,7 +755,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
+    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -827,6 +835,9 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
+    <plurals name="view_users">
+        <item quantity="other">查看 %1$d 名参与者</item>
+    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -881,7 +892,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">寻找更新</string>
+    <string name="pref_use_internal_updater">查找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -914,6 +925,8 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
+    <string name="x_has_written">%s 写道：</string>
+    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -952,6 +965,7 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
+    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -963,4 +977,6 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
+    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
+    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From 260d23bdbc0c46752659976281949f8de836aade Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Wed, 19 Feb 2020 21:42:50 +0100
Subject: New translations strings.xml (Chinese Traditional)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 2e0650222..30f357639 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,7 +84,6 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
-    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -144,9 +143,6 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -158,7 +154,6 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
-    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -307,7 +302,6 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
-    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -446,7 +440,6 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
-    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -484,11 +477,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">非常低（144p）</string>
+    <string name="video_very_low">极低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件（未压缩）</string>
+    <string name="video_original">原文件(未压缩)</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -511,7 +504,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -643,10 +636,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低（720p）</string>
-    <string name="image_mid">中（1920p）</string>
-    <string name="image_high">高（3840p）</string>
-    <string name="image_original">原文件（未压缩）</string>
+    <string name="image_low">低(720p)</string>
+    <string name="image_mid">标准(1920p)</string>
+    <string name="image_high">高 (3840p)</string>
+    <string name="image_original">原版(未压缩)</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -656,7 +649,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录像</string>
+    <string name="action_take_video">录视频</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -690,7 +683,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -740,7 +733,6 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
-    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -755,7 +747,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
+    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -835,9 +827,6 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
-    <plurals name="view_users">
-        <item quantity="other">查看 %1$d 名参与者</item>
-    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -892,7 +881,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">查找更新</string>
+    <string name="pref_use_internal_updater">寻找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -925,8 +914,6 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
-    <string name="x_has_written">%s 写道：</string>
-    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -965,7 +952,6 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
-    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -977,6 +963,4 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
-    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
-    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From db603c330b93cd104ad7d99a85128ff58e7b1d4b Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Sun, 22 Mar 2020 18:31:51 +0100
Subject: New translations strings.xml (Chinese Simplified)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 30f357639..2e0650222 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,6 +84,7 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
+    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -143,6 +144,9 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -154,6 +158,7 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
+    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -302,6 +307,7 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
+    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -440,6 +446,7 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
+    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -477,11 +484,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">极低（144p）</string>
+    <string name="video_very_low">非常低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件(未压缩)</string>
+    <string name="video_original">原文件（未压缩）</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -504,7 +511,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -636,10 +643,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低(720p)</string>
-    <string name="image_mid">标准(1920p)</string>
-    <string name="image_high">高 (3840p)</string>
-    <string name="image_original">原版(未压缩)</string>
+    <string name="image_low">低（720p）</string>
+    <string name="image_mid">中（1920p）</string>
+    <string name="image_high">高（3840p）</string>
+    <string name="image_original">原文件（未压缩）</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -649,7 +656,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录视频</string>
+    <string name="action_take_video">录像</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -683,7 +690,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -733,6 +740,7 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
+    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -747,7 +755,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
+    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -827,6 +835,9 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
+    <plurals name="view_users">
+        <item quantity="other">查看 %1$d 名参与者</item>
+    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -881,7 +892,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">寻找更新</string>
+    <string name="pref_use_internal_updater">查找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -914,6 +925,8 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
+    <string name="x_has_written">%s 写道：</string>
+    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -952,6 +965,7 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
+    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -963,4 +977,6 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
+    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
+    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From 8b9749eeec19353af78956c15b721e3715008d85 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Mon, 23 Mar 2020 18:27:37 +0100
Subject: New translations strings.xml (Chinese Traditional)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 2e0650222..30f357639 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,7 +84,6 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
-    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -144,9 +143,6 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -158,7 +154,6 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
-    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -307,7 +302,6 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
-    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -446,7 +440,6 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
-    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -484,11 +477,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">非常低（144p）</string>
+    <string name="video_very_low">极低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件（未压缩）</string>
+    <string name="video_original">原文件(未压缩)</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -511,7 +504,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -643,10 +636,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低（720p）</string>
-    <string name="image_mid">中（1920p）</string>
-    <string name="image_high">高（3840p）</string>
-    <string name="image_original">原文件（未压缩）</string>
+    <string name="image_low">低(720p)</string>
+    <string name="image_mid">标准(1920p)</string>
+    <string name="image_high">高 (3840p)</string>
+    <string name="image_original">原版(未压缩)</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -656,7 +649,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录像</string>
+    <string name="action_take_video">录视频</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -690,7 +683,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -740,7 +733,6 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
-    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -755,7 +747,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
+    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -835,9 +827,6 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
-    <plurals name="view_users">
-        <item quantity="other">查看 %1$d 名参与者</item>
-    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -892,7 +881,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">查找更新</string>
+    <string name="pref_use_internal_updater">寻找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -925,8 +914,6 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
-    <string name="x_has_written">%s 写道：</string>
-    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -965,7 +952,6 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
-    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -977,6 +963,4 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
-    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
-    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From ca486709ad122c904300736eb5fd121ae6adfa58 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Mon, 23 Mar 2020 18:27:40 +0100
Subject: New translations strings.xml (Chinese Simplified)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 30f357639..2e0650222 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,6 +84,7 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
+    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -143,6 +144,9 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -154,6 +158,7 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
+    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -302,6 +307,7 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
+    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -440,6 +446,7 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
+    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -477,11 +484,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">极低（144p）</string>
+    <string name="video_very_low">非常低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件(未压缩)</string>
+    <string name="video_original">原文件（未压缩）</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -504,7 +511,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -636,10 +643,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低(720p)</string>
-    <string name="image_mid">标准(1920p)</string>
-    <string name="image_high">高 (3840p)</string>
-    <string name="image_original">原版(未压缩)</string>
+    <string name="image_low">低（720p）</string>
+    <string name="image_mid">中（1920p）</string>
+    <string name="image_high">高（3840p）</string>
+    <string name="image_original">原文件（未压缩）</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -649,7 +656,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录视频</string>
+    <string name="action_take_video">录像</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -683,7 +690,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -733,6 +740,7 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
+    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -747,7 +755,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
+    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -827,6 +835,9 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
+    <plurals name="view_users">
+        <item quantity="other">查看 %1$d 名参与者</item>
+    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -881,7 +892,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">寻找更新</string>
+    <string name="pref_use_internal_updater">查找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -914,6 +925,8 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
+    <string name="x_has_written">%s 写道：</string>
+    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -952,6 +965,7 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
+    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -963,4 +977,6 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
+    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
+    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From 9ced052e2b11aa26acf372c185be23b9c3940c00 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Thu, 26 Mar 2020 14:52:40 +0100
Subject: New translations strings.xml (Chinese Traditional)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 2e0650222..30f357639 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,7 +84,6 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
-    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -144,9 +143,6 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -158,7 +154,6 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
-    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -307,7 +302,6 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
-    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -446,7 +440,6 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
-    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -484,11 +477,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">非常低（144p）</string>
+    <string name="video_very_low">极低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件（未压缩）</string>
+    <string name="video_original">原文件(未压缩)</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -511,7 +504,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -643,10 +636,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低（720p）</string>
-    <string name="image_mid">中（1920p）</string>
-    <string name="image_high">高（3840p）</string>
-    <string name="image_original">原文件（未压缩）</string>
+    <string name="image_low">低(720p)</string>
+    <string name="image_mid">标准(1920p)</string>
+    <string name="image_high">高 (3840p)</string>
+    <string name="image_original">原版(未压缩)</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -656,7 +649,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录像</string>
+    <string name="action_take_video">录视频</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -690,7 +683,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -740,7 +733,6 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
-    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -755,7 +747,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
+    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -835,9 +827,6 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
-    <plurals name="view_users">
-        <item quantity="other">查看 %1$d 名参与者</item>
-    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -892,7 +881,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">查找更新</string>
+    <string name="pref_use_internal_updater">寻找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -925,8 +914,6 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
-    <string name="x_has_written">%s 写道：</string>
-    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -965,7 +952,6 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
-    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -977,6 +963,4 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
-    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
-    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From 7507a959b39284b983b0275de52420afa6290b17 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Thu, 26 Mar 2020 14:52:43 +0100
Subject: New translations strings.xml (Chinese Simplified)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 30f357639..2e0650222 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,6 +84,7 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
+    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -143,6 +144,9 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -154,6 +158,7 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
+    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -302,6 +307,7 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
+    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -440,6 +446,7 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
+    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -477,11 +484,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">极低（144p）</string>
+    <string name="video_very_low">非常低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件(未压缩)</string>
+    <string name="video_original">原文件（未压缩）</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -504,7 +511,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -636,10 +643,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低(720p)</string>
-    <string name="image_mid">标准(1920p)</string>
-    <string name="image_high">高 (3840p)</string>
-    <string name="image_original">原版(未压缩)</string>
+    <string name="image_low">低（720p）</string>
+    <string name="image_mid">中（1920p）</string>
+    <string name="image_high">高（3840p）</string>
+    <string name="image_original">原文件（未压缩）</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -649,7 +656,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录视频</string>
+    <string name="action_take_video">录像</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -683,7 +690,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -733,6 +740,7 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
+    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -747,7 +755,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
+    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -827,6 +835,9 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
+    <plurals name="view_users">
+        <item quantity="other">查看 %1$d 名参与者</item>
+    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -881,7 +892,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">寻找更新</string>
+    <string name="pref_use_internal_updater">查找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -914,6 +925,8 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
+    <string name="x_has_written">%s 写道：</string>
+    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -952,6 +965,7 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
+    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -963,4 +977,6 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
+    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
+    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From 6683d4b27c3781dee841b460f3bfdbc93e49b1cb Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Fri, 27 Mar 2020 15:15:48 +0100
Subject: New translations strings.xml (Chinese Traditional)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 2e0650222..30f357639 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,7 +84,6 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
-    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -144,9 +143,6 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -158,7 +154,6 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
-    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -307,7 +302,6 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
-    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -446,7 +440,6 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
-    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -484,11 +477,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">非常低（144p）</string>
+    <string name="video_very_low">极低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件（未压缩）</string>
+    <string name="video_original">原文件(未压缩)</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -511,7 +504,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -643,10 +636,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低（720p）</string>
-    <string name="image_mid">中（1920p）</string>
-    <string name="image_high">高（3840p）</string>
-    <string name="image_original">原文件（未压缩）</string>
+    <string name="image_low">低(720p)</string>
+    <string name="image_mid">标准(1920p)</string>
+    <string name="image_high">高 (3840p)</string>
+    <string name="image_original">原版(未压缩)</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -656,7 +649,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录像</string>
+    <string name="action_take_video">录视频</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -690,7 +683,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -740,7 +733,6 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
-    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -755,7 +747,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
+    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -835,9 +827,6 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
-    <plurals name="view_users">
-        <item quantity="other">查看 %1$d 名参与者</item>
-    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -892,7 +881,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">查找更新</string>
+    <string name="pref_use_internal_updater">寻找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -925,8 +914,6 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
-    <string name="x_has_written">%s 写道：</string>
-    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -965,7 +952,6 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
-    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -977,6 +963,4 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
-    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
-    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From 9c962a4591b9c4cc3f86116f7aff791bab809602 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Fri, 27 Mar 2020 15:15:51 +0100
Subject: New translations strings.xml (Chinese Simplified)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 30f357639..2e0650222 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,6 +84,7 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
+    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -143,6 +144,9 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -154,6 +158,7 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
+    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -302,6 +307,7 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
+    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -440,6 +446,7 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
+    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -477,11 +484,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">极低（144p）</string>
+    <string name="video_very_low">非常低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件(未压缩)</string>
+    <string name="video_original">原文件（未压缩）</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -504,7 +511,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -636,10 +643,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低(720p)</string>
-    <string name="image_mid">标准(1920p)</string>
-    <string name="image_high">高 (3840p)</string>
-    <string name="image_original">原版(未压缩)</string>
+    <string name="image_low">低（720p）</string>
+    <string name="image_mid">中（1920p）</string>
+    <string name="image_high">高（3840p）</string>
+    <string name="image_original">原文件（未压缩）</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -649,7 +656,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录视频</string>
+    <string name="action_take_video">录像</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -683,7 +690,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -733,6 +740,7 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
+    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -747,7 +755,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
+    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -827,6 +835,9 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
+    <plurals name="view_users">
+        <item quantity="other">查看 %1$d 名参与者</item>
+    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -881,7 +892,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">寻找更新</string>
+    <string name="pref_use_internal_updater">查找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -914,6 +925,8 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
+    <string name="x_has_written">%s 写道：</string>
+    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -952,6 +965,7 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
+    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -963,4 +977,6 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
+    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
+    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From ef57241e153e9fc2ce4142ba7d59ece6fc5dc24f Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Sun, 29 Mar 2020 12:16:44 +0200
Subject: New translations strings.xml (Chinese Traditional)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 2e0650222..30f357639 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,7 +84,6 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
-    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -144,9 +143,6 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -158,7 +154,6 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
-    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -307,7 +302,6 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
-    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -446,7 +440,6 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
-    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -484,11 +477,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">非常低（144p）</string>
+    <string name="video_very_low">极低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件（未压缩）</string>
+    <string name="video_original">原文件(未压缩)</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -511,7 +504,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -643,10 +636,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低（720p）</string>
-    <string name="image_mid">中（1920p）</string>
-    <string name="image_high">高（3840p）</string>
-    <string name="image_original">原文件（未压缩）</string>
+    <string name="image_low">低(720p)</string>
+    <string name="image_mid">标准(1920p)</string>
+    <string name="image_high">高 (3840p)</string>
+    <string name="image_original">原版(未压缩)</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -656,7 +649,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录像</string>
+    <string name="action_take_video">录视频</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -690,7 +683,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -740,7 +733,6 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
-    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -755,7 +747,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
+    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -835,9 +827,6 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
-    <plurals name="view_users">
-        <item quantity="other">查看 %1$d 名参与者</item>
-    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -892,7 +881,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">查找更新</string>
+    <string name="pref_use_internal_updater">寻找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -925,8 +914,6 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
-    <string name="x_has_written">%s 写道：</string>
-    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -965,7 +952,6 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
-    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -977,6 +963,4 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
-    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
-    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From 6d62eca223f1458f31b2dbc3a90f6243fc2353f2 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Sun, 29 Mar 2020 12:16:46 +0200
Subject: New translations strings.xml (Chinese Simplified)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 30f357639..2e0650222 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,6 +84,7 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
+    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -143,6 +144,9 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -154,6 +158,7 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
+    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -302,6 +307,7 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
+    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -440,6 +446,7 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
+    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -477,11 +484,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">极低（144p）</string>
+    <string name="video_very_low">非常低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件(未压缩)</string>
+    <string name="video_original">原文件（未压缩）</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -504,7 +511,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -636,10 +643,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低(720p)</string>
-    <string name="image_mid">标准(1920p)</string>
-    <string name="image_high">高 (3840p)</string>
-    <string name="image_original">原版(未压缩)</string>
+    <string name="image_low">低（720p）</string>
+    <string name="image_mid">中（1920p）</string>
+    <string name="image_high">高（3840p）</string>
+    <string name="image_original">原文件（未压缩）</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -649,7 +656,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录视频</string>
+    <string name="action_take_video">录像</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -683,7 +690,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -733,6 +740,7 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
+    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -747,7 +755,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
+    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -827,6 +835,9 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
+    <plurals name="view_users">
+        <item quantity="other">查看 %1$d 名参与者</item>
+    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -881,7 +892,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">寻找更新</string>
+    <string name="pref_use_internal_updater">查找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -914,6 +925,8 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
+    <string name="x_has_written">%s 写道：</string>
+    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -952,6 +965,7 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
+    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -963,4 +977,6 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
+    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
+    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From 8b6fbc43bf8585971281cb13125079f16f4e671c Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Mon, 30 Mar 2020 12:21:02 +0200
Subject: New translations strings.xml (Chinese Traditional)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 2e0650222..30f357639 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,7 +84,6 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
-    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -144,9 +143,6 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -158,7 +154,6 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
-    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -307,7 +302,6 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
-    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -446,7 +440,6 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
-    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -484,11 +477,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">非常低（144p）</string>
+    <string name="video_very_low">极低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件（未压缩）</string>
+    <string name="video_original">原文件(未压缩)</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -511,7 +504,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -643,10 +636,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低（720p）</string>
-    <string name="image_mid">中（1920p）</string>
-    <string name="image_high">高（3840p）</string>
-    <string name="image_original">原文件（未压缩）</string>
+    <string name="image_low">低(720p)</string>
+    <string name="image_mid">标准(1920p)</string>
+    <string name="image_high">高 (3840p)</string>
+    <string name="image_original">原版(未压缩)</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -656,7 +649,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录像</string>
+    <string name="action_take_video">录视频</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -690,7 +683,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -740,7 +733,6 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
-    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -755,7 +747,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
+    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -835,9 +827,6 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
-    <plurals name="view_users">
-        <item quantity="other">查看 %1$d 名参与者</item>
-    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -892,7 +881,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">查找更新</string>
+    <string name="pref_use_internal_updater">寻找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -925,8 +914,6 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
-    <string name="x_has_written">%s 写道：</string>
-    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -965,7 +952,6 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
-    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -977,6 +963,4 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
-    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
-    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From 829f4122b39df319d79ae474f5012d92c7f478ce Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Mon, 30 Mar 2020 12:21:06 +0200
Subject: New translations strings.xml (Chinese Simplified)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 30f357639..2e0650222 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,6 +84,7 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
+    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -143,6 +144,9 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -154,6 +158,7 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
+    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -302,6 +307,7 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
+    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -440,6 +446,7 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
+    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -477,11 +484,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">极低（144p）</string>
+    <string name="video_very_low">非常低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件(未压缩)</string>
+    <string name="video_original">原文件（未压缩）</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -504,7 +511,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -636,10 +643,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低(720p)</string>
-    <string name="image_mid">标准(1920p)</string>
-    <string name="image_high">高 (3840p)</string>
-    <string name="image_original">原版(未压缩)</string>
+    <string name="image_low">低（720p）</string>
+    <string name="image_mid">中（1920p）</string>
+    <string name="image_high">高（3840p）</string>
+    <string name="image_original">原文件（未压缩）</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -649,7 +656,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录视频</string>
+    <string name="action_take_video">录像</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -683,7 +690,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -733,6 +740,7 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
+    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -747,7 +755,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
+    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -827,6 +835,9 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
+    <plurals name="view_users">
+        <item quantity="other">查看 %1$d 名参与者</item>
+    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -881,7 +892,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">寻找更新</string>
+    <string name="pref_use_internal_updater">查找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -914,6 +925,8 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
+    <string name="x_has_written">%s 写道：</string>
+    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -952,6 +965,7 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
+    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -963,4 +977,6 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
+    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
+    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From 7208a71045dd0dcb4844745f404ad6d212b1fe80 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Wed, 1 Apr 2020 21:37:28 +0200
Subject: New translations strings.xml (Chinese Traditional)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 2e0650222..30f357639 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,7 +84,6 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
-    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -144,9 +143,6 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -158,7 +154,6 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
-    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -307,7 +302,6 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
-    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -446,7 +440,6 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
-    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -484,11 +477,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">非常低（144p）</string>
+    <string name="video_very_low">极低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件（未压缩）</string>
+    <string name="video_original">原文件(未压缩)</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -511,7 +504,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -643,10 +636,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低（720p）</string>
-    <string name="image_mid">中（1920p）</string>
-    <string name="image_high">高（3840p）</string>
-    <string name="image_original">原文件（未压缩）</string>
+    <string name="image_low">低(720p)</string>
+    <string name="image_mid">标准(1920p)</string>
+    <string name="image_high">高 (3840p)</string>
+    <string name="image_original">原版(未压缩)</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -656,7 +649,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录像</string>
+    <string name="action_take_video">录视频</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -690,7 +683,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -740,7 +733,6 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
-    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -755,7 +747,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
+    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -835,9 +827,6 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
-    <plurals name="view_users">
-        <item quantity="other">查看 %1$d 名参与者</item>
-    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -892,7 +881,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">查找更新</string>
+    <string name="pref_use_internal_updater">寻找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -925,8 +914,6 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
-    <string name="x_has_written">%s 写道：</string>
-    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -965,7 +952,6 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
-    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -977,6 +963,4 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
-    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
-    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From e778db81c716d656715712c633e805e94cc90a9f Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Wed, 1 Apr 2020 21:37:31 +0200
Subject: New translations strings.xml (Chinese Simplified)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 30f357639..2e0650222 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,6 +84,7 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
+    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -143,6 +144,9 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -154,6 +158,7 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
+    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -302,6 +307,7 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
+    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -440,6 +446,7 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
+    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -477,11 +484,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">极低（144p）</string>
+    <string name="video_very_low">非常低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件(未压缩)</string>
+    <string name="video_original">原文件（未压缩）</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -504,7 +511,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -636,10 +643,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低(720p)</string>
-    <string name="image_mid">标准(1920p)</string>
-    <string name="image_high">高 (3840p)</string>
-    <string name="image_original">原版(未压缩)</string>
+    <string name="image_low">低（720p）</string>
+    <string name="image_mid">中（1920p）</string>
+    <string name="image_high">高（3840p）</string>
+    <string name="image_original">原文件（未压缩）</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -649,7 +656,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录视频</string>
+    <string name="action_take_video">录像</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -683,7 +690,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -733,6 +740,7 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
+    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -747,7 +755,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
+    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -827,6 +835,9 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
+    <plurals name="view_users">
+        <item quantity="other">查看 %1$d 名参与者</item>
+    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -881,7 +892,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">寻找更新</string>
+    <string name="pref_use_internal_updater">查找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -914,6 +925,8 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
+    <string name="x_has_written">%s 写道：</string>
+    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -952,6 +965,7 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
+    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -963,4 +977,6 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
+    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
+    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From bdf31aea33ff3c6ed55d0ab6e4062876ab5d0401 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Thu, 2 Apr 2020 21:36:09 +0200
Subject: New translations strings.xml (Chinese Traditional)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 2e0650222..30f357639 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,7 +84,6 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
-    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -144,9 +143,6 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -158,7 +154,6 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
-    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -307,7 +302,6 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
-    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -446,7 +440,6 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
-    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -484,11 +477,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">非常低（144p）</string>
+    <string name="video_very_low">极低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件（未压缩）</string>
+    <string name="video_original">原文件(未压缩)</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -511,7 +504,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -643,10 +636,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低（720p）</string>
-    <string name="image_mid">中（1920p）</string>
-    <string name="image_high">高（3840p）</string>
-    <string name="image_original">原文件（未压缩）</string>
+    <string name="image_low">低(720p)</string>
+    <string name="image_mid">标准(1920p)</string>
+    <string name="image_high">高 (3840p)</string>
+    <string name="image_original">原版(未压缩)</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -656,7 +649,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录像</string>
+    <string name="action_take_video">录视频</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -690,7 +683,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -740,7 +733,6 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
-    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -755,7 +747,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
+    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -835,9 +827,6 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
-    <plurals name="view_users">
-        <item quantity="other">查看 %1$d 名参与者</item>
-    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -892,7 +881,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">查找更新</string>
+    <string name="pref_use_internal_updater">寻找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -925,8 +914,6 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
-    <string name="x_has_written">%s 写道：</string>
-    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -965,7 +952,6 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
-    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -977,6 +963,4 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
-    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
-    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From fa083983a85c4792da778c76ca590c65f08db500 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Thu, 2 Apr 2020 21:36:10 +0200
Subject: New translations strings.xml (Chinese Simplified)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 30f357639..2e0650222 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,6 +84,7 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
+    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -143,6 +144,9 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -154,6 +158,7 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
+    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -302,6 +307,7 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
+    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -440,6 +446,7 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
+    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -477,11 +484,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">极低（144p）</string>
+    <string name="video_very_low">非常低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件(未压缩)</string>
+    <string name="video_original">原文件（未压缩）</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -504,7 +511,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -636,10 +643,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低(720p)</string>
-    <string name="image_mid">标准(1920p)</string>
-    <string name="image_high">高 (3840p)</string>
-    <string name="image_original">原版(未压缩)</string>
+    <string name="image_low">低（720p）</string>
+    <string name="image_mid">中（1920p）</string>
+    <string name="image_high">高（3840p）</string>
+    <string name="image_original">原文件（未压缩）</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -649,7 +656,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录视频</string>
+    <string name="action_take_video">录像</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -683,7 +690,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -733,6 +740,7 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
+    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -747,7 +755,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
+    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -827,6 +835,9 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
+    <plurals name="view_users">
+        <item quantity="other">查看 %1$d 名参与者</item>
+    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -881,7 +892,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">寻找更新</string>
+    <string name="pref_use_internal_updater">查找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -914,6 +925,8 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
+    <string name="x_has_written">%s 写道：</string>
+    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -952,6 +965,7 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
+    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -963,4 +977,6 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
+    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
+    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From e6ae2427eae68a23d23ec9664d03bbc09acbc778 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Sun, 5 Apr 2020 21:32:47 +0200
Subject: New translations strings.xml (Chinese Traditional)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 2e0650222..30f357639 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,7 +84,6 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
-    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -144,9 +143,6 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -158,7 +154,6 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
-    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -307,7 +302,6 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
-    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -446,7 +440,6 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
-    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -484,11 +477,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">非常低（144p）</string>
+    <string name="video_very_low">极低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件（未压缩）</string>
+    <string name="video_original">原文件(未压缩)</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -511,7 +504,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -643,10 +636,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低（720p）</string>
-    <string name="image_mid">中（1920p）</string>
-    <string name="image_high">高（3840p）</string>
-    <string name="image_original">原文件（未压缩）</string>
+    <string name="image_low">低(720p)</string>
+    <string name="image_mid">标准(1920p)</string>
+    <string name="image_high">高 (3840p)</string>
+    <string name="image_original">原版(未压缩)</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -656,7 +649,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录像</string>
+    <string name="action_take_video">录视频</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -690,7 +683,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -740,7 +733,6 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
-    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -755,7 +747,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
+    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -835,9 +827,6 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
-    <plurals name="view_users">
-        <item quantity="other">查看 %1$d 名参与者</item>
-    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -892,7 +881,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">查找更新</string>
+    <string name="pref_use_internal_updater">寻找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -925,8 +914,6 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
-    <string name="x_has_written">%s 写道：</string>
-    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -965,7 +952,6 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
-    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -977,6 +963,4 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
-    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
-    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From 8fcaea2e17056bddd24c40bf42fad44e029e7da9 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Sun, 5 Apr 2020 21:32:50 +0200
Subject: New translations strings.xml (Chinese Simplified)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 30f357639..2e0650222 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,6 +84,7 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
+    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -143,6 +144,9 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -154,6 +158,7 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
+    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -302,6 +307,7 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
+    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -440,6 +446,7 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
+    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -477,11 +484,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">极低（144p）</string>
+    <string name="video_very_low">非常低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件(未压缩)</string>
+    <string name="video_original">原文件（未压缩）</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -504,7 +511,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -636,10 +643,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低(720p)</string>
-    <string name="image_mid">标准(1920p)</string>
-    <string name="image_high">高 (3840p)</string>
-    <string name="image_original">原版(未压缩)</string>
+    <string name="image_low">低（720p）</string>
+    <string name="image_mid">中（1920p）</string>
+    <string name="image_high">高（3840p）</string>
+    <string name="image_original">原文件（未压缩）</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -649,7 +656,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录视频</string>
+    <string name="action_take_video">录像</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -683,7 +690,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -733,6 +740,7 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
+    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -747,7 +755,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
+    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -827,6 +835,9 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
+    <plurals name="view_users">
+        <item quantity="other">查看 %1$d 名参与者</item>
+    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -881,7 +892,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">寻找更新</string>
+    <string name="pref_use_internal_updater">查找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -914,6 +925,8 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
+    <string name="x_has_written">%s 写道：</string>
+    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -952,6 +965,7 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
+    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -963,4 +977,6 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
+    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
+    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From 52329da9e5bf092022c73fd10747fa554c087cd7 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Mon, 6 Apr 2020 21:56:54 +0200
Subject: New translations strings.xml (Chinese Traditional)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 2e0650222..30f357639 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,7 +84,6 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
-    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -144,9 +143,6 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -158,7 +154,6 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
-    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -307,7 +302,6 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
-    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -446,7 +440,6 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
-    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -484,11 +477,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">非常低（144p）</string>
+    <string name="video_very_low">极低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件（未压缩）</string>
+    <string name="video_original">原文件(未压缩)</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -511,7 +504,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -643,10 +636,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低（720p）</string>
-    <string name="image_mid">中（1920p）</string>
-    <string name="image_high">高（3840p）</string>
-    <string name="image_original">原文件（未压缩）</string>
+    <string name="image_low">低(720p)</string>
+    <string name="image_mid">标准(1920p)</string>
+    <string name="image_high">高 (3840p)</string>
+    <string name="image_original">原版(未压缩)</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -656,7 +649,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录像</string>
+    <string name="action_take_video">录视频</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -690,7 +683,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -740,7 +733,6 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
-    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -755,7 +747,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
+    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -835,9 +827,6 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
-    <plurals name="view_users">
-        <item quantity="other">查看 %1$d 名参与者</item>
-    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -892,7 +881,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">查找更新</string>
+    <string name="pref_use_internal_updater">寻找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -925,8 +914,6 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
-    <string name="x_has_written">%s 写道：</string>
-    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -965,7 +952,6 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
-    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -977,6 +963,4 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
-    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
-    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From ae5947bc7e5c422d6fae24439bcf08e5c8f4c991 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Mon, 6 Apr 2020 21:56:57 +0200
Subject: New translations strings.xml (Chinese Simplified)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 30f357639..2e0650222 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,6 +84,7 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
+    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -143,6 +144,9 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -154,6 +158,7 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
+    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -302,6 +307,7 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
+    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -440,6 +446,7 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
+    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -477,11 +484,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">极低（144p）</string>
+    <string name="video_very_low">非常低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件(未压缩)</string>
+    <string name="video_original">原文件（未压缩）</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -504,7 +511,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -636,10 +643,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低(720p)</string>
-    <string name="image_mid">标准(1920p)</string>
-    <string name="image_high">高 (3840p)</string>
-    <string name="image_original">原版(未压缩)</string>
+    <string name="image_low">低（720p）</string>
+    <string name="image_mid">中（1920p）</string>
+    <string name="image_high">高（3840p）</string>
+    <string name="image_original">原文件（未压缩）</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -649,7 +656,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录视频</string>
+    <string name="action_take_video">录像</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -683,7 +690,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -733,6 +740,7 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
+    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -747,7 +755,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
+    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -827,6 +835,9 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
+    <plurals name="view_users">
+        <item quantity="other">查看 %1$d 名参与者</item>
+    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -881,7 +892,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">寻找更新</string>
+    <string name="pref_use_internal_updater">查找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -914,6 +925,8 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
+    <string name="x_has_written">%s 写道：</string>
+    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -952,6 +965,7 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
+    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -963,4 +977,6 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
+    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
+    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From be8d1564604079a0eb36386edff736ab5e958f8e Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Mon, 6 Apr 2020 22:25:56 +0200
Subject: New translations strings.xml (Chinese Traditional)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 2e0650222..30f357639 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,7 +84,6 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
-    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -144,9 +143,6 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -158,7 +154,6 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
-    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -307,7 +302,6 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
-    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -446,7 +440,6 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
-    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -484,11 +477,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">非常低（144p）</string>
+    <string name="video_very_low">极低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件（未压缩）</string>
+    <string name="video_original">原文件(未压缩)</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -511,7 +504,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -643,10 +636,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低（720p）</string>
-    <string name="image_mid">中（1920p）</string>
-    <string name="image_high">高（3840p）</string>
-    <string name="image_original">原文件（未压缩）</string>
+    <string name="image_low">低(720p)</string>
+    <string name="image_mid">标准(1920p)</string>
+    <string name="image_high">高 (3840p)</string>
+    <string name="image_original">原版(未压缩)</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -656,7 +649,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录像</string>
+    <string name="action_take_video">录视频</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -690,7 +683,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -740,7 +733,6 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
-    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -755,7 +747,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
+    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -835,9 +827,6 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
-    <plurals name="view_users">
-        <item quantity="other">查看 %1$d 名参与者</item>
-    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -892,7 +881,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">查找更新</string>
+    <string name="pref_use_internal_updater">寻找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -925,8 +914,6 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
-    <string name="x_has_written">%s 写道：</string>
-    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -965,7 +952,6 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
-    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -977,6 +963,4 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
-    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
-    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3


From 4f48eb877ff48077a690a20548f00f80746f3b27 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <kriztan@users.noreply.github.com>
Date: Mon, 6 Apr 2020 22:25:58 +0200
Subject: New translations strings.xml (Chinese Simplified)

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

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

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 30f357639..2e0650222 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -84,6 +84,7 @@
     <string name="your_nick_has_been_changed">您的昵称已更改</string>
     <string name="send_unencrypted">未加密发送</string>
     <string name="decryption_failed">解密失败。可能您没有合适的私钥。</string>
+    <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Pix-Art聊天通过名为<b>OpenKeychain</b>的第三方应用，加密、解密消息并管理公钥。\n\nOpenKeychain在GPLv3下发布，可在F-Droid和Google Play上下载。\n\n<small>(之后请重启Pix-Art聊天.)</small></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
@@ -143,6 +144,9 @@
     <string name="account_status_incompatible_server">不兼容的服务器</string>
     <string name="account_status_stream_error">传输错误</string>
     <string name="encryption_choice_unencrypted">未加密</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="encryption_choice_omemo">OMEMO</string>
     <string name="action_account">编辑帐户</string>
     <string name="mgmt_account_delete">删除帐户</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
@@ -154,6 +158,7 @@
     <string name="mgmt_account_delete_confirm_message">如果您删除了帐户，则本地对话历史记录将丢失。\n\n如果您从服务器删除帐户，则您的帐户也将从服务器中删除，在注册新帐户之前，您将无法登录。</string>
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
+    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="password">密码</string>
     <string name="invalid_jid">Jabber用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
@@ -302,6 +307,7 @@
     <string name="notification_restored_backup_title">您的备份已恢复</string>
     <string name="notification_restored_backup_subtitle">不要忘记启用帐户</string>
     <string name="choose_file">选择文件</string>
+    <string name="receiving_file">正在接收：%1$s</string>
     <string name="download_x_file">下载%s</string>
     <string name="delete_x_file">删除%s</string>
     <string name="file">文件</string>
@@ -440,6 +446,7 @@
     <string name="pref_dnd_on_silent_mode_summary">当设备静音时，将您标记为“请勿打扰”状态</string>
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">当设备处于振动状态时，将您标记为“请勿打扰”</string>
+    <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">用证书添加帐户</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
     <string name="authenticate_with_certificate">留空以验证w/证书</string>
@@ -477,11 +484,11 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_very_low">极低（144p）</string>
+    <string name="video_very_low">非常低（144p）</string>
     <string name="video_low">低（360p）</string>
     <string name="video_mid">中（720p）</string>
     <string name="video_high">高（1080p）</string>
-    <string name="video_original">原文件(未压缩)</string>
+    <string name="video_original">原文件（未压缩）</string>
     <string name="always">总是</string>
     <string name="always_off">始终关闭</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
@@ -504,7 +511,7 @@
     <string name="share_uri_with">与…共享URI</string>
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
-    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以通过XMPP/Jabber和其他人聊天了。</string>
+    <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
     <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -636,10 +643,10 @@
     <string name="pref_use_tor">通过Tor连接</string>
     <string name="pref_use_tor_summary">通过Tor网络隧道连接所有连接。</string>
     <string name="pref_connection_options">连接选项</string>
-    <string name="image_low">低(720p)</string>
-    <string name="image_mid">标准(1920p)</string>
-    <string name="image_high">高 (3840p)</string>
-    <string name="image_original">原版(未压缩)</string>
+    <string name="image_low">低（720p）</string>
+    <string name="image_mid">中（1920p）</string>
+    <string name="image_high">高（3840p）</string>
+    <string name="image_original">原文件（未压缩）</string>
     <string name="last_seen_just_away">最近</string>
     <string name="send_message">发送消息</string>
     <string name="send_failed_resend">传送失败，重新发送…</string>
@@ -649,7 +656,7 @@
     <string name="session_failure">对话失败</string>
     <string name="sasl_downgrade">降级SASL机制</string>
     <string name="action_take_photo">拍照</string>
-    <string name="action_take_video">录视频</string>
+    <string name="action_take_video">录像</string>
     <string name="account_status_regis_web">服务器需要在网站上注册</string>
     <string name="application_found_to_open_website">没有找到打开网站的应用程序</string>
     <string name="open_website">打开网站</string>
@@ -683,7 +690,7 @@
     <string name="destroy_room_dialog">您想解散群聊%s吗？</string>
     <string name="destroy_room_succeed">群聊成功解散</string>
     <string name="destroy_room_failed">无法解散群聊</string>
-    <string name="no_write_access_in_public_muc">您没有参与此群聊所以现在不能发消息。\n请点<b>是</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信。</string>
+    <string name="no_write_access_in_public_muc">您没有参与此群聊，所以现在不能发消息。\n请点<b>确定</b>，进入群聊详情，然后长按任何一个管理员的名称，发送一条私信请求许可。</string>
     <string name="snooze">稍后再响</string>
     <string name="huawei_protected_apps">受保护的应用</string>
     <string name="huawei_protected_apps_summary">要持续接收通知，即使屏幕关闭，您也需要将Pix-Art聊天添加到受保护的应用列表中。</string>
@@ -733,6 +740,7 @@
     <string name="not_encrypted_for_this_device">该条消息没有为此设备加密</string>
     <string name="no_microphone_permission">Pix-Art聊天需要访问麦克风</string>
     <string name="search_messages">搜索消息</string>
+    <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
     <string name="web_address">网址</string>
     <string name="jabber_id_copied_to_clipboard">将Jabber用户名复制到剪贴板</string>
@@ -747,7 +755,7 @@
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索字段中</string>
     <string name="paste_as_quote">粘贴选中的内容</string>
     <string name="group_chat_avatar">群聊头像</string>
-    <string name="host_does_not_support_group_chat_avatars">主机不支持头像</string>
+    <string name="host_does_not_support_group_chat_avatars">服务器不支持群组头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改头像</string>
     <string name="contact_name">联系人名称</string>
     <string name="nickname">群聊昵称</string>
@@ -827,6 +835,9 @@
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
     <string name="pref_prefer_xmpp_avatar_summary">首选用户的XMPP头像而不是通讯录中的头像</string>
     <string name="pref_prefer_xmpp_avatar">首选XMPP头像</string>
+    <plurals name="view_users">
+        <item quantity="other">查看 %1$d 名参与者</item>
+    </plurals>
     <string name="group_chat_members">参与者</string>
     <string name="message_deleted">消息已删除</string>
     <string name="channel_details">群聊详情</string>
@@ -881,7 +892,7 @@
     <string name="pref_show_mappreview_inside_summary">直接在聊天视图中显示地图预览，将建立与Pix-Art服务器的连接。</string>
     <string name="pref_show_mappreview_inside">显示位置预览</string>
     <string name="pref_use_internal_updater_summary">让应用每天查找更新</string>
-    <string name="pref_use_internal_updater">寻找更新</string>
+    <string name="pref_use_internal_updater">查找更新</string>
     <string name="attach">添加附件</string>
     <string name="delete_from_server">从服务器删除</string>
     <string name="go_online_to_delete">您需要登录想删除的账户。</string>
@@ -914,6 +925,8 @@
     <string name="please_enter_password">请输入此帐户的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="waiting_for_transfer">等待传输</string>
+    <string name="x_has_written">%s 写道：</string>
+    <string name="i_have_written">我写道：</string>
     <string name="your_status">您的状态</string>
     <string name="pref_use_invidious">用 Invidio 链接替换 Youtube 链接</string>
     <string name="pref_use_invidious_summary">Invidious是一个更注重隐私的YouTube替代品</string>
@@ -952,6 +965,7 @@ Pix-Arr Messenger</string>
     <string name="no_results">无结果</string>
     <string name="file_transmission_cancelled">文件传输取消</string>
     <string name="sharing_application_not_grant_permission">分享文件的应用没有授予该文件的权限。</string>
+    <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户会选择“jabber.network”以便从公共 XMPP 生态系统获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
@@ -963,4 +977,6 @@ Pix-Arr Messenger</string>
     <string name="pref_theme_orange">橙色</string>
     <string name="pref_theme_color_options_summary">选择主题调色板</string>
     <string name="pref_theme_color_options">主题颜色</string>
+    <string name="pref_enable_otr_summary">为信息加密启用 OTR 加密</string>
+    <string name="pref_enable_otr">启用 OTR 加密</string>
 </resources>
-- 
cgit v1.2.3