From 67c0e602650e837eef2b2ea714f909b3b2c69966 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Fri, 23 Mar 2018 01:31:13 +0100
Subject: [PATCH 1/2] New translations strings.xml (Chinese Traditional)

---
 app/src/main/res/values-zh/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index fadefd1df..fd73da432 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -32,7 +32,7 @@
   <string name="other_instance">其他实例比 mastodon.etalab.gouv.fr 更...？</string>
   <string name="no_result">没有结果!</string>
   <string name="instance">实例</string>
-  <string name="instance_example">实例: mastodon.social</string>
+  <string name="instance_example">實例: mastodon.social</string>
   <string name="toast_account_changed" formatted="false">现在使用 %1$s 这个帐户</string>
   <string name="add_account">添加帐户</string>
   <string name="clipboard">已将toot 的内容复制到剪贴板</string>

From 594df9a87ef385fd4b749bc537c8214b1dc88ff0 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Fri, 23 Mar 2018 07:45:36 +0100
Subject: [PATCH 2/2] New translations strings.xml (Chinese Simplified)

---
 app/src/main/res/values-zh/strings.xml | 134 ++++++++++++-------------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index fd73da432..5a7d478de 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -4,35 +4,35 @@
   <string name="navigation_drawer_open">打开菜单</string>
   <string name="navigation_drawer_close">关闭菜单</string>
   <string name="action_about">关于</string>
-  <string name="action_about_instance">关于实例</string>
+  <string name="action_about_instance">关于此实例</string>
   <string name="action_privacy">隐私</string>
   <string name="action_cache">缓存</string>
-  <string name="action_logout">注销</string>
+  <string name="action_logout">登出</string>
   <string name="login">登录</string>
   <!-- common -->
   <string name="close">关闭</string>
   <string name="yes">是</string>
-  <string name="no">否　</string>
+  <string name="no">否</string>
   <string name="cancel">取消</string>
   <string name="download">下载</string>
   <string name="download_file">下载 %1$s</string>
   <string name="download_over">下载完成</string>
   <string name="save_file">保存 %1$s</string>
-  <string name="save_over">媒體已儲存</string>
+  <string name="save_over">媒体已保存</string>
   <string name="download_from" formatted="false">文件: %1$s</string>
   <string name="password">密码</string>
   <string name="email">电子邮箱</string>
   <string name="accounts">帐户</string>
   <string name="toots">Toots</string>
   <string name="tags">标签</string>
-  <string name="token">代币</string>
+  <string name="token">令牌</string>
   <string name="save">保存</string>
-  <string name="restore">還原</string>
+  <string name="restore">恢复</string>
   <string name="two_factor_authentification">两步验证？</string>
-  <string name="other_instance">其他实例比 mastodon.etalab.gouv.fr 更...？</string>
+  <string name="other_instance">mastodon.etalab.gouv.fr 之外的其他实例...？</string>
   <string name="no_result">没有结果!</string>
   <string name="instance">实例</string>
-  <string name="instance_example">實例: mastodon.social</string>
+  <string name="instance_example">实例: mastodon.social</string>
   <string name="toast_account_changed" formatted="false">现在使用 %1$s 这个帐户</string>
   <string name="add_account">添加帐户</string>
   <string name="clipboard">已将toot 的内容复制到剪贴板</string>
@@ -44,8 +44,8 @@
   <string name="speech_prompt">请说点什么</string>
   <string name="speech_not_supported">抱歉! 您的设备不支持语音输入!</string>
   <string name="delete_all">删除全部</string>
-  <string name="translate_toot">翻译这个toot。</string>
-  <string name="schedule">日程</string>
+  <string name="translate_toot">翻译此条 toot。</string>
+  <string name="schedule">定时发布</string>
   <string name="text_size">文本和图标大小</string>
   <string name="text_size_change">更改当前文本大小:</string>
   <string name="icon_size_change">更改当前图标大小:</string>
@@ -63,8 +63,8 @@
   <string name="favourite">收藏</string>
   <string name="follow">新关注者</string>
   <string name="mention">提及</string>
-  <string name="reblog">提高</string>
-  <string name="show_boosts">显示提高</string>
+  <string name="reblog">转发</string>
+  <string name="show_boosts">显示转发</string>
   <string name="show_replies">显示答复</string>
   <string name="action_open_in_web">在浏览器中打开</string>
   <string name="translate">翻译</string>
@@ -75,15 +75,15 @@
   <string name="global_menu">联邦时间线</string>
   <string name="neutral_menu_title">选项</string>
   <string name="favorites_menu">收藏</string>
-  <string name="communication_menu_title">通信</string>
+  <string name="communication_menu_title">交流</string>
   <string name="muted_menu">静音用户</string>
   <string name="blocked_menu">被封用户</string>
-  <string name="remote_follow_menu">远程跟踪</string>
+  <string name="remote_follow_menu">远程关注</string>
   <string name="notifications">通知</string>
   <string name="follow_request">关注请求</string>
   <string name="optimization">优化</string>
   <string name="settings">设置</string>
-  <string name="profile">配置</string>
+  <string name="profile">个人资料</string>
   <string name="make_a_choice">你想做什么？</string>
   <string name="delete_account_title">删除帐户</string>
   <string name="delete_account_message" formatted="false">是否从应用程序中删除帐户 %1$s ？</string>
@@ -92,24 +92,24 @@
   <string name="choose_file_error">找不到文件资源管理器!</string>
   <string name="click_to_change">点击路径更改</string>
   <string name="failed">失败!</string>
-  <string name="scheduled_toots">预定toots</string>
-  <string name="disclaimer_full">下面的信息可能不完全反映用户的配置文件。</string>
+  <string name="scheduled_toots">定时 toots</string>
+  <string name="disclaimer_full">下面的信息可能不完全反映该用户的资料。</string>
   <string name="insert_emoji">插入表情符号</string>
   <string name="no_emoji">当前该应用程序没有收集自定义表情。</string>
   <string name="live_notif">实时通知</string>
   <!-- Status -->
   <string name="no_status">无toot显示</string>
   <string name="fav_added">Toot被加入了收藏</string>
-  <string name="fav_removed">Toot被从收藏中移除了!</string>
-  <string name="reblog_added">Toot增强了!</string>
-  <string name="reblog_removed">Toot不再增强了！</string>
-  <string name="reblog_by">增强了 %1$s</string>
+  <string name="fav_removed">已从收藏中移除该 toot！</string>
+  <string name="reblog_added">已转发此条 toot！</string>
+  <string name="reblog_removed">已撤销转发此条 toot！</string>
+  <string name="reblog_by">由 %1$s 转发</string>
   <string name="favourite_add">将这个toot添加到你的收藏夹？</string>
   <string name="favourite_remove">从你的收藏夹中去掉这个toot？</string>
-  <string name="reblog_add">增强这个toot？</string>
-  <string name="reblog_remove">恢复增强这个toot？</string>
-  <string name="pin_add">把这个toot显示到前端？</string>
-  <string name="pin_remove">取消这个toot的前端显示操作？</string>
+  <string name="reblog_add">转发此条 toot？</string>
+  <string name="reblog_remove">取消转发此条 toot？</string>
+  <string name="pin_add">将这条 toot 置顶？</string>
+  <string name="pin_remove">取消这条 toot 的置顶状态？</string>
   <string name="more_action_1">静音</string>
   <string name="more_action_2">阻止</string>
   <string name="more_action_3">报告</string>
@@ -121,13 +121,13 @@
   <string-array name="more_action_confirm">
     <item>是否将此帐户静音？</item>
     <item>是否将此帐户屏蔽？</item>
-    <item>报告这个toot？</item>
+    <item>举报这条 toot？</item>
   </string-array>
   <string-array name="more_action_owner_confirm">
-    <item>移除这个toot？</item>
+    <item>移除这条 toot？</item>
   </string-array>
   <plurals name="preview_replies">
-    <item quantity="other">%d 回复</item>
+    <item quantity="other">%d 个回复</item>
   </plurals>
   <string name="bookmarks">Bookmarks</string>
   <string name="bookmarks_empty">No bookmarks to display</string>
@@ -145,14 +145,14 @@
   <string name="cw">顺时针</string>
   <string name="toot_title">写一个toot</string>
   <string name="toot_title_reply">回复一个toot</string>
-  <string name="toot_no_space">您已达到允许的500字符!</string>
+  <string name="toot_no_space">您已达到允许的 500 字符上限！</string>
   <string name="toot_select_image">选择媒体</string>
   <string name="toot_select_image_error">选择介质时出错!</string>
   <string name="toot_delete_media">是否删除此媒体？</string>
-  <string name="toot_error_no_content">你的toot是空的!</string>
+  <string name="toot_error_no_content">您的 toot 是空的！</string>
   <string name="toot_visibility_tilte">Toot可见性</string>
   <string name="toots_visibility_tilte">默认情况下, toot的可见性: </string>
-  <string name="toot_sent">Toot已被发送!</string>
+  <string name="toot_sent">Toot 已发送！</string>
   <string name="toot_reply_content_title">您正在回复此toot:</string>
   <string name="toot_sensitive">敏感内容？</string>
   <string-array name="toot_visibility">
@@ -162,11 +162,11 @@
     <item>仅张贴给所述用户</item>
   </string-array>
   <string name="no_draft">没有草稿!</string>
-  <string name="choose_toot">选择一个toot</string>
+  <string name="choose_toot">选择一条 toot</string>
   <string name="choose_accounts">选择帐号</string>
   <string name="select_accounts">选择一些帐户</string>
   <string name="remove_draft">删除草稿？</string>
-  <string name="show_reply">点击按钮显示初始toot</string>
+  <string name="show_reply">点击按钮显示原始 toot</string>
   <string name="upload_form_description">为视觉障碍人士描述</string>
   <!-- Instance -->
   <string name="instance_no_description">没有可用的描述!</string>
@@ -176,9 +176,9 @@
   <string name="about_license">许可证: </string>
   <string name="about_license_action">GNU GPL V3</string>
   <string name="about_code">源代码: </string>
-  <string name="about_yandex">Toot的翻译:</string>
+  <string name="about_yandex">Toot 的翻译：</string>
   <string name="about_thekinrar">搜索实例:</string>
-  <string name="about_thekinrar_action">实例. 社会</string>
+  <string name="about_thekinrar_action">instances.social</string>
   <string name="thanks_text_logo">图标设计者:</string>
   <!-- Conversation -->
   <string name="conversation">会话</string>
@@ -192,13 +192,13 @@
   <string name="authorize">授权</string>
   <string name="reject">拒绝</string>
   <!-- Scheduled toots -->
-  <string name="no_scheduled_toots">没有预定的toot显示!</string>
-  <string name="no_scheduled_toots_indications">编写一个toot, 然后从顶部菜单中选择 <b> 计划 </b>。</string>
-  <string name="remove_scheduled">删除计划的toot？</string>
+  <string name="no_scheduled_toots">没有定时的 toot 可以显示！</string>
+  <string name="no_scheduled_toots_indications">编写一条 toot, 然后从顶部菜单中选择 <b>定时发布</b>。</string>
+  <string name="remove_scheduled">删除该定时 toot？</string>
   <string name="media_count">媒体: %d</string>
-  <string name="toot_scheduled">Toot已经安排好了!</string>
-  <string name="toot_scheduled_date">计划日期必须大于当前小时!</string>
-  <string name="warning_battery">已启用电池保护程序! 它可能无法按预期方式工作。</string>
+  <string name="toot_scheduled">Toot 将在预定时间发送！</string>
+  <string name="toot_scheduled_date">预定的时间必须晚于当前时间！</string>
+  <string name="warning_battery">已启用省电模式！它可能无法按预期方式工作。</string>
   <!-- timed mute -->
   <string name="timed_mute_date_error">The time for muting should be greater than one minute.</string>
   <string name="timed_mute_date">%1$s has been muted until %2$s.\n You can unmute this account from his/her profile page.</string>
@@ -206,23 +206,23 @@
   <!-- Notifications -->
   <string name="no_notifications">没有要显示的通知</string>
   <string name="notif_mention">提到你</string>
-  <string name="notif_reblog">更新您的状态</string>
+  <string name="notif_reblog">转发了您的状态</string>
   <string name="notif_favourite">收藏您的状态</string>
   <string name="notif_follow">关注了您</string>
-  <string name="notif_pouet">来自 %1$s 的新toot</string>
+  <string name="notif_pouet">来自 %1$s 的新 toot</string>
   <plurals name="other_notifications">
     <item quantity="other">和另外一个通知</item>
   </plurals>
   <plurals name="other_notif_hometimeline">
-    <item quantity="other">和 %d 其他的toot等待发现</item>
+    <item quantity="other">和 %d 条其他的 toot 等待发现</item>
   </plurals>
   <string name="delete_notification_ask">是否删除通知？</string>
   <string name="delete_notification_ask_all">是否删除所有通知？</string>
-  <string name="delete_notification">通知已被删除!</string>
-  <string name="delete_notification_all">所有通知都已删除!</string>
+  <string name="delete_notification">已删除该通知！</string>
+  <string name="delete_notification_all">已删除所有通知！</string>
   <!-- HEADER -->
   <string name="following">关注中</string>
-  <string name="followers">粉丝</string>
+  <string name="followers">关注者</string>
   <string name="pinned_toots">已置顶</string>
   <!-- TOAST -->
   <string name="client_error">无法获取客户端 id!</string>
@@ -231,10 +231,10 @@
   <string name="toast_unblock">帐户不再被阻止!</string>
   <string name="toast_mute">帐户被静音!</string>
   <string name="toast_unmute">帐户不再静音!</string>
-  <string name="toast_follow">账户已被关注!</string>
-  <string name="toast_unfollow">帐户不再被关注!</string>
-  <string name="toast_reblog">Toot被静音了!</string>
-  <string name="toast_unreblog">Toot不再静音！</string>
+  <string name="toast_follow">已关注此账户！</string>
+  <string name="toast_unfollow">已不再关注此账户！</string>
+  <string name="toast_reblog">Toot 已被转发！</string>
+  <string name="toast_unreblog">已撤销转发此条 toot！</string>
   <string name="toast_favourite">Toot被添加进了收藏夹!</string>
   <string name="toast_unfavourite">Toot被从收藏中移除了!</string>
   <string name="toast_report">Toot被报告了!</string>
@@ -242,7 +242,7 @@
   <string name="toast_pin">Toot被置于前端了！</string>
   <string name="toast_unpin">Toot被取消置于前端了！</string>
   <string name="toast_error">哎呀! 发生错误!</string>
-  <string name="toast_code_error">发生错误! 该实例未返回授权代码!</string>
+  <string name="toast_code_error">发生错误！该实例未返回认证代码！</string>
   <string name="toast_error_instance">实例范围貌似非法！</string>
   <string name="toast_error_loading_account">在帐户间切换时发生错误!</string>
   <string name="toast_error_search">搜索时出错!</string>
@@ -253,20 +253,20 @@
   <string name="toast_error_translate">翻译时出错!</string>
   <string name="toast_toot_saved">草稿被保存!</string>
   <string name="toast_error_char_limit">您确定此实例是否允许此数量的字符？通常, 此值接近500个字符。</string>
-  <string name="toast_visibility_changed">%1$s 帐户的toot可见性已更改</string>
+  <string name="toast_visibility_changed">已更改帐户 %1$s 的 toot 可见性</string>
   <string name="toast_empty_search">实例名称和屏幕名称不能为空!</string>
   <!-- Settings -->
   <string name="settings_title_optimisation">优化加载</string>
-  <string name="set_toots_page">每个负载的toot数量</string>
-  <string name="set_accounts_page">每个负载的帐户数</string>
-  <string name="set_notifications_page">每个负载的通知数</string>
+  <string name="set_toots_page">每次加载的toot数量</string>
+  <string name="set_accounts_page">每次加载的帐户数</string>
+  <string name="set_notifications_page">每次加载的通知数</string>
   <string name="set_attachment_always">始终</string>
   <string name="set_attachment_wifi">WIFI</string>
   <string name="set_attachment_ask">提问</string>
   <string name="set_attachment_action">加载媒体</string>
   <string name="load_attachment">加载图片</string>
   <string name="load_attachment_spoiler">显示更多…</string>
-  <string name="load_attachment_spoiler_less">Show less…</string>
+  <string name="load_attachment_spoiler_less">收起</string>
   <string name="load_sensitive_attachment">敏感内容</string>
   <string name="set_display_reply">在回复中显示上一条消息</string>
   <string name="set_display_local">显示本地时间线</string>
@@ -275,18 +275,18 @@
   <string name="set_folder_title">路径: </string>
   <string name="set_auto_store_toot">自动保存草稿</string>
   <string name="set_bubble_counter">显示计数器</string>
-  <string name="set_auto_add_media_url">在toots里添加媒体的 URL</string>
+  <string name="set_auto_add_media_url">在 toots 里添加媒体的 URL</string>
   <string name="settings_title_notifications">管理通知</string>
   <string name="set_notif_follow">当有人关注您时通知</string>
   <string name="set_notif_follow_ask">当某人请求您关注时通知</string>
-  <string name="set_notif_follow_share">当某人提升您的状态时通知您</string>
+  <string name="set_notif_follow_share">当某人转发您的状态时通知您</string>
   <string name="set_notif_follow_add">当某人收藏您的状态时通知您</string>
   <string name="set_notif_follow_mention">当有人提到您时通知您</string>
-  <string name="set_share_validation">增强前显示确认对话框</string>
+  <string name="set_share_validation">转发前显示确认对话框</string>
   <string name="set_share_validation_fav">在添加到收藏夹之前显示确认对话框</string>
   <string name="settings_title_more_options">高级设置</string>
   <string name="set_wifi_only">仅在 WIFI 中通知</string>
-  <string name="set_notify">通知?</string>
+  <string name="set_notify">开启通知？</string>
   <string name="set_notif_silent">静音通知</string>
   <string name="set_night_mode">夜间模式</string>
   <string name="set_nsfw_timeout">NSFW 查看超时 (秒, 0 表示关闭)</string>
@@ -295,10 +295,10 @@
   <string name="set_lock_account">Lock account</string>
   <string name="set_save_changes">保存修改</string>
   <string name="set_header_picture_overlay">选择页眉图片</string>
-  <string name="set_preview_reply">显示家庭时间线中答复的数量</string>
+  <string name="set_preview_reply">在首页时间线中显示回复的数量</string>
   <string name="set_preview_reply_pp">是否显示配置文件图片？</string>
   <string name="set_multiaccount_actions">允许客户之间的交互？</string>
-  <string name="note_no_space">您已达到允许的160字符!</string>
+  <string name="note_no_space">您已达到允许的 160 字符上限！</string>
   <string name="username_no_space">您已达到允许的30字符!</string>
   <string name="settings_title_hour">通知的时间段:</string>
   <string name="settings_time_from">介于</string>
@@ -339,7 +339,7 @@
     <item>白色</item>
   </string-array>
   <string name="set_title_news">新闻</string>
-  <string name="set_notification_news">在家庭时间线上通知新的toots</string>
+  <string name="set_notification_news">当首页时间线上有新的新的 toots 时通知您</string>
   <string name="set_show_error_messages">显示错误消息</string>
   <string name="action_follow">关注</string>
   <string name="action_unfollow">取消关注</string>
@@ -359,7 +359,7 @@
 请确认要接收的推送通知。
          您可以稍后在设置 (通知选项卡) 中启用或禁用这些通知。   
     </string>
-  <string name="settings_popup_timeline">针对国内时间线的未读toots?</string>
+  <string name="settings_popup_timeline">为主页时间线的未读 toots？</string>
   <string name="settings_popup_notification">针对未读通知？</string>
   <!-- CACHE -->
   <string name="cache_title">清除缓存</string>
@@ -438,11 +438,11 @@
   <string name="action_lists_delete">Delete list</string>
   <string name="action_lists_update">Edit list</string>
   <string name="action_lists_title_placeholder">New list title</string>
-  <string name="action_lists_search_users">Search among people you follow</string>
+  <string name="action_lists_search_users">在您关注的人中搜索</string>
   <string name="action_lists_owner">Your lists</string>
   <!-- Migration -->
   <string name="account_moved_to">%1$s has moved to %2$s</string>
-  <string name="show_boost_count">Show boosts/favourites count</string>
+  <string name="show_boost_count">显示转发/收藏数目</string>
   <string name="issue_login_title">Authentication does not work?</string>
   <string name="issue_login_message">
         <b>Here are some checks that might help:</b>\n\n