From 0ee5dd866db5df093b2a37ee66bcb473625a9b7d Mon Sep 17 00:00:00 2001
From: aka-rin <29725543+aka-rin@users.noreply.github.com>
Date: Sat, 4 May 2019 02:39:09 +0800
Subject: [PATCH] Update Chinese translations (#1236)

* Update zh-CN translations.

* Update zh-SG translations.

* Update zh-TW translations.

* Update zh-HK translations

* Update zh-MO translations.
---
 app/src/main/res/values-zh-rCN/strings.xml | 216 +++++++++++++-
 app/src/main/res/values-zh-rHK/strings.xml | 232 ++++++++++++++-
 app/src/main/res/values-zh-rMO/strings.xml | 232 ++++++++++++++-
 app/src/main/res/values-zh-rSG/strings.xml | 319 +++++++++++++++++----
 app/src/main/res/values-zh-rTW/strings.xml | 232 ++++++++++++++-
 5 files changed, 1130 insertions(+), 101 deletions(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e3a26a67..44452765 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -21,6 +21,7 @@
     <string name="error_report_too_few_statuses">至少要报告 1 则嘟文</string>
     <string name="error_invalid_regex">正则表达式无效</string>
     <string name="error_sender_account_gone">嘟文发送时出错</string>
+
     <string name="title_home">主页</string>
     <string name="title_advanced">高级</string>
     <string name="title_notifications">通知</string>
@@ -29,6 +30,7 @@
     <string name="title_direct_messages">私信</string>
     <string name="title_tab_preferences">标签页</string>
     <string name="title_view_thread">嘟文</string>
+    <string name="title_tag">#%s</string>
     <string name="title_statuses">嘟文</string>
     <string name="title_statuses_with_replies">嘟文和回复</string>
     <string name="title_statuses_pinned">已置顶</string>
@@ -41,6 +43,8 @@
     <string name="title_edit_profile">编辑个人资料</string>
     <string name="title_saved_toot">草稿</string>
     <string name="title_licenses">开源协议</string>
+
+    <string name="status_username_format">\@%s</string>
     <string name="status_boosted_format">%s 转嘟了</string>
     <string name="status_sensitive_media_title">敏感内容</string>
     <string name="status_media_hidden_title">已隐藏的照片或视频</string>
@@ -49,17 +53,23 @@
     <string name="status_content_warning_show_less">折叠内容</string>
     <string name="status_content_show_more">展开</string>
     <string name="status_content_show_less">折叠</string>
+
     <string name="message_empty">还没有内容</string>
     <string name="footer_empty">还没有内容，向下拉动即可刷新</string>
+
     <string name="notification_reblog_format">%s 转嘟了你的嘟文</string>
     <string name="notification_favourite_format">%s 收藏了你的嘟文</string>
     <string name="notification_follow_format">%s 关注了你</string>
+
     <string name="report_username_format">报告用户 @%s 的滥用行为</string>
     <string name="report_comment_hint">报告更多信息</string>
+
     <string name="action_quick_reply">快速回复</string>
     <string name="action_reply">回复</string>
     <string name="action_reblog">转嘟</string>
+    <string name="action_unreblog">取消转嘟</string>
     <string name="action_favourite">收藏</string>
+    <string name="action_unfavourite">取消收藏</string>
     <string name="action_more">更多</string>
     <string name="action_compose">发表新嘟文</string>
     <string name="action_login">登录 Mastodon 帐号</string>
@@ -73,6 +83,7 @@
     <string name="action_show_reblogs">显示转嘟</string>
     <string name="action_report">报告</string>
     <string name="action_delete">删除</string>
+    <string name="action_delete_and_redraft">删除并重新编辑</string>
     <string name="action_send">发嘟</string>
     <string name="action_send_public">发嘟！</string>
     <string name="action_retry">重试</string>
@@ -106,44 +117,76 @@
     <string name="action_content_warning">设置内容提醒信息</string>
     <string name="action_emoji_keyboard">插入表情符号</string>
     <string name="action_add_tab">添加标签页</string>
+    <string name="action_links">链接</string>
+    <string name="action_mentions">提及</string>
+    <string name="action_hashtags">话题</string>
+    <string name="action_open_reblogger">打开转发者主页</string>
+    <string name="action_open_reblogged_by">显示转发者</string>
+    <string name="action_open_faved_by">显示收藏者</string>
+
+    <string name="title_hashtags_dialog">话题</string>
+    <string name="title_mentions_dialog">提及</string>
+    <string name="title_links_dialog">链接</string>
+    <string name="action_open_media_n">打开媒体文件 #%d</string>
+
     <string name="download_image">正在下载 %1$s…</string>
+
     <string name="action_copy_link">复制链接</string>
     <string name="action_open_as">打开为 %s</string>
     <string name="action_share_as">分享为 …</string>
+    <string name="download_media">下载媒体文件</string>
+    <string name="downloading_media">正在下载媒体文件</string>
+
     <string name="send_status_link_to">分享链接到…</string>
     <string name="send_status_content_to">分享嘟文到…</string>
     <string name="send_media_to">分享媒体到…</string>
+
     <string name="confirmation_reported">报告已发送！</string>
     <string name="confirmation_unblocked">已解除屏蔽</string>
     <string name="confirmation_unmuted">已取消隐藏</string>
+
     <string name="status_sent">已发送！</string>
     <string name="status_sent_long">成功发布回复</string>
+
     <string name="hint_domain">域名</string>
     <string name="hint_compose">有什么新鲜事？</string>
     <string name="hint_content_warning">内容提醒</string>
     <string name="hint_display_name">昵称</string>
     <string name="hint_note">简介</string>
     <string name="hint_search">搜索…</string>
+
     <string name="search_no_results">没找到结果</string>
+
     <string name="label_quick_reply">回复…</string>
     <string name="label_avatar">头像</string>
     <string name="label_header">标题</string>
+
     <string name="link_whats_an_instance">需要帮助？</string>
+
     <string name="login_connection">正在连接…</string>
-    <string name="dialog_whats_an_instance">请输入你帐号所在的 Mastodon 站点的域名，比如 pawoo.net，acg.mn，mao.daizhige.org，<a href="https://instances.social">等等</a> 。
+
+    <string name="dialog_whats_an_instance">请输入你帐号所在的 Mastodon 站点的域名，比如 pawoo.net，acg.mn，wxw.moe，<a href="https://instances.social">等等</a> 。
         \n\n还没有 Mastodon 帐号？你也可以输入想注册的 Mastodon 站点的域名，然后在该服务器创建新的帐号并授权 Tusky 登入
         \n\n在 Mastodon 里，跨站互动和站内互动一样简单。可以前往 <a href="https://joinmastodon.org">https://joinmastodon.org</a> 了解更多信息。
     </string>
+
+
+
+
+
     <string name="dialog_title_finishing_media_upload">正在结束上传…</string>
     <string name="dialog_message_uploading_media">正在上传…</string>
     <string name="dialog_download_image">下载</string>
     <string name="dialog_message_cancel_follow_request">移除关注请求？</string>
     <string name="dialog_unfollow_warning">不再关注此用户？</string>
     <string name="dialog_delete_toot_warning">删除这条嘟文？</string>
+    <string name="dialog_redraft_toot_warning">删除并重新编辑这条嘟文？</string>
+
     <string name="visibility_public">公开：所有人可见，并会出现在公共时间轴上</string>
     <string name="visibility_unlisted">不公开：所有人可见，但不会出现在公共时间轴上</string>
     <string name="visibility_private">仅关注者：只有经过你确认后关注你的用户可见</string>
     <string name="visibility_direct">私信：只有被提及的用户可见</string>
+
     <string name="pref_title_notification_settings">通知</string>
     <string name="pref_title_edit_notification_settings">通知设置</string>
     <string name="pref_title_notifications_enabled">通知</string>
@@ -160,13 +203,18 @@
     <string name="pref_title_appearance_settings">外观</string>
     <string name="pref_title_app_theme">应用主题</string>
     <string name="pref_title_timelines">时间轴</string>
+    <string name="pref_title_timeline_filters">过滤器</string>
+
     <string name="app_them_dark">黑夜</string>
     <string name="app_theme_light">白天</string>
     <string name="app_theme_black">暗色</string>
     <string name="app_theme_auto">自动切换</string>
+    <string name="app_theme_system">跟随系统设定</string>
+
     <string name="pref_title_browser_settings">浏览器</string>
     <string name="pref_title_custom_tabs">使用 Chrome Custom Tabs</string>
     <string name="pref_title_hide_follow_button">浏览时自动隐藏发嘟按钮</string>
+    <string name="pref_title_language">界面语言</string>
     <string name="pref_title_status_filter">时间轴过滤</string>
     <string name="pref_title_status_tabs">标签页</string>
     <string name="pref_title_show_boosts">显示转嘟</string>
@@ -177,58 +225,78 @@
     <string name="pref_title_http_proxy_enable">启用 HTTP 代理</string>
     <string name="pref_title_http_proxy_server">HTTP 代理服务器</string>
     <string name="pref_title_http_proxy_port">HTTP 代理端口</string>
+
     <string name="pref_default_post_privacy">嘟文默认可见范围</string>
     <string name="pref_default_media_sensitivity">自动标记媒体为敏感内容</string>
     <string name="pref_publishing">发布（与服务器同步）</string>
     <string name="pref_failed_to_sync">同步设置失败</string>
+
     <string name="post_privacy_public">公开</string>
     <string name="post_privacy_unlisted">不公开</string>
     <string name="post_privacy_followers_only">仅关注者</string>
+
     <string name="pref_status_text_size">字体大小</string>
+
     <string name="status_text_size_smallest">最小</string>
     <string name="status_text_size_small">小</string>
     <string name="status_text_size_medium">标准</string>
     <string name="status_text_size_large">大</string>
     <string name="status_text_size_largest">最大</string>
+
     <string name="pref_media_display">媒体显示</string>
+
     <string name="media_hide_sensitive">自动隐藏敏感媒体</string>
     <string name="media_hide_none">总是显示敏感媒体</string>
     <string name="media_hide_all">总是隐藏所有媒体</string>
-    <string name="notification_mention_name">被提及</string>
-    <string name="notification_mention_descriptions">当有用户在嘟文中提及我时</string>
-    <string name="notification_follow_name">关注者</string>
-    <string name="notification_follow_description">当有用户关注我时</string>
-    <string name="notification_boost_name">转嘟</string>
-    <string name="notification_boost_description">当有用户转嘟了我的嘟文时</string>
-    <string name="notification_favourite_name">收藏</string>
-    <string name="notification_favourite_description">当有用户收藏了我的嘟文时</string>
+
+    <string name="notification_channel_mention_name">被提及</string>
+    <string name="notification_channel_mention_descriptions">当有用户在嘟文中提及我时</string>
+    <string name="notification_channel_follow_name">关注者</string>
+    <string name="notification_channel_follow_description">当有用户关注我时</string>
+    <string name="notification_channel_boost_name">转嘟</string>
+    <string name="notification_channel_boost_description">当有用户转嘟了我的嘟文时</string>
+    <string name="notification_channel_favourite_name">收藏</string>
+    <string name="notification_channel_favourite_description">当有用户收藏了我的嘟文时</string>
+
+
     <string name="notification_mention_format">%s 提及了你</string>
     <string name="notification_summary_large">%1$s, %2$s, %3$s 和 %4$d 人</string>
     <string name="notification_summary_medium">%1$s, %2$s, 和 %3$s</string>
     <string name="notification_summary_small">%1$s 和 %2$s</string>
     <string name="notification_title_summary">%d 个新互动</string>
+
     <string name="description_account_locked">被锁定的帐号</string>
+
     <string name="about_title_activity">关于 Tusky</string>
+    <string name="about_tusky_version">Tusky %s</string>
     <string name="about_tusky_license">Tusky 是基于 GNU General Public License Version 3 许可证开源的自由软件。完整的许可证协议：https://www.gnu.org/licenses/gpl-3.0.en.html</string>
+
+
     <!-- note to translators:
          * you should think of “free” as in “free speech,” not as in “free beer”.
            We sometimes call it “libre software,” borrowing the French or Spanish word for “free” as in freedom,
            to show we do not mean the software is gratis. Source: https://www.gnu.org/philosophy/free-sw.html
          * the url can be changed to link to the localized version of the license.
     -->
-    <string name="about_project_site">        项目地址：\n
+    <string name="about_project_site">
+        项目地址：\n
         https://tusky.app
     </string>
-    <string name="about_bug_feature_request_site">        问题反馈：\n
+    <string name="about_bug_feature_request_site">
+        问题反馈：\n
         https://github.com/tuskyapp/Tusky/issues
     </string>
     <string name="about_tusky_account">Tusky 官方帐号</string>
+
     <string name="status_share_content">分享嘟文内容</string>
     <string name="status_share_link">分享嘟文链接</string>
     <string name="status_media_images">照片</string>
     <string name="status_media_video">视频</string>
+
     <string name="state_follow_requested">已发送关注请求</string>
+
     <string name="no_content">没有内容</string>
+
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
     <string name="abbreviated_in_years">%d 年内</string>
     <string name="abbreviated_in_days">%d 天内</string>
@@ -240,17 +308,46 @@
     <string name="abbreviated_hours_ago">%d 小时前</string>
     <string name="abbreviated_minutes_ago">%d 分钟前</string>
     <string name="abbreviated_seconds_ago">%d 秒前</string>
+
+    <!--These are for timestamps on polls -->
+    <string name="timespan_days">%d 天</string>
+    <string name="timespan_hours">%d 小时</string>
+    <string name="timespan_minutes">%d 分钟</string>
+    <string name="timespan_seconds">%d 秒</string>
+
     <string name="follows_you">关注了你</string>
     <string name="pref_title_alway_show_sensitive_media">总是显示所有敏感媒体内容</string>
     <string name="title_media">媒体</string>
     <string name="replying_to">回复 @%s</string>
     <string name="load_more_placeholder_text">加载更多</string>
+
+    <string name="pref_title_public_filter_keywords">公共时间轴</string>
+    <string name="pref_title_thread_filter_keywords">对话</string>
+    <string name="filter_addition_dialog_title">添加新的过滤器</string>
+    <string name="filter_edit_dialog_title">编辑过滤器</string>
+    <string name="filter_dialog_remove_button">移除</string>
+    <string name="filter_dialog_update_button">更新</string>
+    <string name="filter_add_description">需要过滤的文字</string>
+
     <string name="add_account_name">添加帐号</string>
     <string name="add_account_description">添加新的 Mastodon 帐号</string>
+
     <string name="action_lists">列表</string>
     <string name="title_lists">列表</string>
     <string name="title_list_timeline">列表公共时间轴</string>
+    <string name="error_create_list">无法新建列表</string>
+    <string name="error_rename_list">无法重命名列表</string>
+    <string name="error_delete_list">无法删除列表</string>
+    <string name="action_create_list">新建列表</string>
+    <string name="action_rename_list">重命名列表</string>
+    <string name="action_delete_list">删除列表</string>
+    <string name="action_edit_list">编辑列表</string>
+    <string name="hint_search_people_list">搜索已关注的用户</string>
+    <string name="action_add_to_list">添加用户到列表</string>
+    <string name="action_remove_from_list">从列表中移除用户</string>
+
     <string name="compose_active_account_description">以 %1$s 发布嘟文</string>
+
     <string name="error_failed_set_caption">设置图片标题失败</string>
     <string name="hint_describe_for_visually_impaired">为视觉障碍用户提供的描述\n(限制 %d 字)</string>
     <string name="action_set_caption">设置图片标题</string>
@@ -264,6 +361,8 @@
     <string name="send_toot_notification_cancel_title">发送已被取消</string>
     <string name="send_toot_notification_saved_content">嘟文已保存为草稿</string>
     <string name="action_compose_shortcut">发表嘟文</string>
+
+    <string name="error_no_custom_emojis">当前实例 %s 没有自定义表情符号</string>
     <string name="copy_to_clipboard_success">已复制到剪贴板</string>
     <string name="emoji_style">表情符号风格</string>
     <string name="system_default">系统默认</string>
@@ -278,27 +377,118 @@
     <string name="caption_systememoji">系统内置的表情符号</string>
     <string name="caption_blobmoji">Android 4.4–7.1 的黄馒头表情符号</string>
     <string name="caption_twemoji">Mastodon 使用的表情符号</string>
+    <!-- string name="emoji_shortcode_format" translatable="false">:%s:</string -->
+
     <string name="download_failed">下载失败</string>
+
     <string name="profile_badge_bot_text">机器人</string>
     <string name="account_moved_description">%1$s 已迁移到：</string>
+
     <string name="reblog_private">转嘟（可见者不变）</string>
     <string name="unreblog_private">取消转嘟</string>
+
     <string name="license_description">Tusky 使用了以下开源项目的源码：</string>
     <string name="license_apache_2">以 Apache License 授权（详见下方）</string>
+    <string name="license_cc_by_4">CC-BY 4.0</string>
+    <string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
+
     <string name="profile_metadata_label">个人资料附加信息</string>
     <string name="profile_metadata_add">添加信息</string>
     <string name="profile_metadata_label_label">标签</string>
     <string name="profile_metadata_content_label">内容</string>
+
     <string name="pref_title_absolute_time">嘟文显示精确时间</string>
+
     <string name="label_remote_account">以下信息可能并不完整，要查看完整资料请使用浏览器打开</string>
+
     <string name="unpin_action">取消置顶</string>
     <string name="pin_action">置顶</string>
+
     <plurals name="favs">
-        <item quantity="other">&lt;b&gt;%1$s&lt;/b&gt; 收藏</item>
+        <item quantity="one">&lt;b>%1$s&lt;/b> 次收藏</item>
+        <item quantity="other">&lt;b&gt;%1$s&lt;/b&gt; 次收藏</item>
     </plurals>
+
     <plurals name="reblogs">
-        <item quantity="other">&lt;b&gt;%s&lt;/b&gt; 转嘟</item>
+        <item quantity="one">&lt;b>%s&lt;/b> 次转嘟</item>
+        <item quantity="other">&lt;b&gt;%s&lt;/b&gt; 次转嘟</item>
     </plurals>
+
+    <string name="title_reblogged_by">转嘟者</string>
+    <string name="title_favourited_by">收藏者</string>
+
+    <string name="conversation_1_recipients">%1$s</string>
     <string name="conversation_2_recipients">%1$s 和 %2$s</string>
     <string name="conversation_more_recipients">%1$s, %2$s 和 %3$d 等人</string>
+    <string name="max_tab_number_reached">标签页不能超过 %1$d 个</string>
+
+
+    <string name="description_status_media">
+        媒体: %s
+    </string>
+    <string name="description_status_cw">
+        内容提醒: %s
+    </string>
+    <string name="description_status_media_no_description_placeholder">
+        没有媒体描述信息
+    </string>
+    <string name="description_status_reblogged">
+        被转嘟
+    </string>
+    <string name="description_status_favourited">
+        被收藏
+    </string>
+    <string name="description_visiblity_public">
+        公开
+    </string>
+    <string name="description_visiblity_unlisted">
+        不公开
+    </string>
+    <string name="description_visiblity_private">
+        仅关注者
+    </string>
+    <string name="description_visiblity_direct">
+        私信
+    </string>
+    <string name="description_status">
+        <!-- Display name, cw?, content?, relative date, reposted by?, reposted?, favorited?, username, media?; visibility, fav number?, reblog number?-->
+        %1$s; %2$s; %3$s, %4$s, %5$s; %6$s, %7$s, %8$s, %9$s; %10$s, %11$s, %12$s
+    </string>
+
+    <string name="hint_list_name">列表名</string>
+
+    <string name="edit_hashtag_title">编辑话题</string>
+    <string name="edit_hashtag_hint">不带 # 的话题名字</string>
+    <string name="hashtag">话题</string>
+    <string name="notifications_clear">清除</string>
+    <string name="notifications_apply_filter">过滤</string>
+    <string name="filter_favorites">@string/notification_channel_favourite_name</string>
+    <string name="filter_boosts">@string/notification_channel_boost_name</string>
+    <string name="filter_follows">@string/notification_channel_follow_name</string>
+    <string name="filter_mentions">@string/notification_channel_mention_name</string>
+    <string name="filter_apply">应用</string>
+
+    <string name="compose_shortcut_long_label">发表新嘟文</string>
+    <string name="compose_shortcut_short_label">新嘟文</string>
+    <string name="pref_title_bot_overlay">显示机器人标志</string>
+
+    <string name="notification_clear_text">你确定要永久清空通知列表吗？</string>
+
+    <string name="poll_info_format">
+        <!-- 15 votes • 1 hour left -->
+        %1$s • %2$s</string>
+    <plurals name="poll_info_votes">
+        <item quantity="one">%s 次投票</item>
+        <item quantity="other">%s 次投票</item>
+    </plurals>
+    <string name="poll_info_time_relative">剩余 %s</string>
+    <string name="poll_info_time_absolute">%s 结束</string>
+    <string name="poll_info_closed">已结束</string>
+    <string name="poll_option_format">
+        <!-- 15% vote for this! -->
+        &lt;b>%1$d%%&lt;/b> %2$s</string>
+
+    <string name="poll_vote">投票</string>
+
+
 </resources>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 27b9019e..4580bbb5 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="error_generic">應用程式出現異常</string>
+    <string name="error_network">網絡請求出錯，請檢查互聯網連接並重試</string>
     <string name="error_empty">內容不能為空</string>
     <string name="error_invalid_domain">該域名無效</string>
     <string name="error_failed_app_registration">無法連接此伺服器</string>
@@ -20,14 +21,19 @@
     <string name="error_report_too_few_statuses">至少要檢舉 1 則嘟文</string>
     <string name="error_invalid_regex">正規表示式無效</string>
     <string name="error_sender_account_gone">嘟文發送時出錯</string>
+
     <string name="title_home">主頁</string>
     <string name="title_advanced">進階</string>
     <string name="title_notifications">通知</string>
     <string name="title_public_local">本站時間軸</string>
     <string name="title_public_federated">跨站公開時間軸</string>
+    <string name="title_direct_messages">私信</string>
+    <string name="title_tab_preferences">標籤頁</string>
     <string name="title_view_thread">嘟文</string>
+    <string name="title_tag">#%s</string>
     <string name="title_statuses">嘟文</string>
     <string name="title_statuses_with_replies">嘟文和回覆</string>
+    <string name="title_statuses_pinned">已置顶</string>
     <string name="title_follows">正在關注</string>
     <string name="title_followers">關注者</string>
     <string name="title_favourites">我的收藏</string>
@@ -37,6 +43,8 @@
     <string name="title_edit_profile">編輯個人資料</string>
     <string name="title_saved_toot">草稿</string>
     <string name="title_licenses">開源授權</string>
+
+    <string name="status_username_format">\@%s</string>
     <string name="status_boosted_format">%s 轉嘟了</string>
     <string name="status_sensitive_media_title">敏感內容</string>
     <string name="status_media_hidden_title">已隱藏的照片或影片</string>
@@ -45,16 +53,23 @@
     <string name="status_content_warning_show_less">摺疊內容</string>
     <string name="status_content_show_more">展開</string>
     <string name="status_content_show_less">摺疊</string>
+
+    <string name="message_empty">沒有內容</string>
     <string name="footer_empty">還沒有內容，向下拉動即可重新整理</string>
+
     <string name="notification_reblog_format">%s 轉嘟了你的嘟文</string>
     <string name="notification_favourite_format">%s 收藏了你的嘟文</string>
     <string name="notification_follow_format">%s 關注了你</string>
+
     <string name="report_username_format">檢舉使用者 @%s 的濫用行為</string>
     <string name="report_comment_hint">更多評論？</string>
+
     <string name="action_quick_reply">快速回覆</string>
     <string name="action_reply">回覆</string>
     <string name="action_reblog">轉嘟</string>
+    <string name="action_unreblog">取消轉嘟</string>
     <string name="action_favourite">收藏</string>
+    <string name="action_unfavourite">取消收藏</string>
     <string name="action_more">更多</string>
     <string name="action_compose">發表新嘟文</string>
     <string name="action_login">登入 Mastodon 帳號</string>
@@ -68,6 +83,7 @@
     <string name="action_show_reblogs">顯示轉嘟</string>
     <string name="action_report">檢舉</string>
     <string name="action_delete">刪除</string>
+    <string name="action_delete_and_redraft">刪除並重新編輯</string>
     <string name="action_send">發嘟</string>
     <string name="action_send_public">發嘟！</string>
     <string name="action_retry">重試</string>
@@ -100,39 +116,77 @@
     <string name="action_toggle_visibility">設定嘟文可見範圍</string>
     <string name="action_content_warning">設定敏感內容警告</string>
     <string name="action_emoji_keyboard">插入表情符號</string>
+    <string name="action_add_tab">新增標籤頁</string>
+    <string name="action_links">連結</string>
+    <string name="action_mentions">提及</string>
+    <string name="action_hashtags">話題</string>
+    <string name="action_open_reblogger">打開轉嘟者主頁</string>
+    <string name="action_open_reblogged_by">顯示轉嘟者</string>
+    <string name="action_open_faved_by">顯示收藏者</string>
+
+    <string name="title_hashtags_dialog">話題</string>
+    <string name="title_mentions_dialog">提及</string>
+    <string name="title_links_dialog">連結</string>
+    <string name="action_open_media_n">打開媒體 #%d</string>
+
     <string name="download_image">正在下載 %1$s…</string>
+
     <string name="action_copy_link">複製連結</string>
+    <string name="action_open_as">打開為 %s</string>
+    <string name="action_share_as">分享為 …</string>
+    <string name="download_media">下載媒體</string>
+    <string name="downloading_media">正在下載媒體</string>
+
     <string name="send_status_link_to">分享連結到…</string>
     <string name="send_status_content_to">分享嘟文到…</string>
     <string name="send_media_to">分享媒體到…</string>
+
     <string name="confirmation_reported">已檢舉！</string>
     <string name="confirmation_unblocked">已解除封鎖</string>
     <string name="confirmation_unmuted">已解除靜音</string>
+
     <string name="status_sent">已發送！</string>
     <string name="status_sent_long">成功送出回覆</string>
+
     <string name="hint_domain">域名</string>
     <string name="hint_compose">有什麼新鮮事？</string>
     <string name="hint_content_warning">敏感內容警告</string>
     <string name="hint_display_name">暱稱</string>
     <string name="hint_note">簡介</string>
     <string name="hint_search">搜尋…</string>
+
     <string name="search_no_results">沒找到結果</string>
+
     <string name="label_quick_reply">回覆…</string>
     <string name="label_avatar">頭像</string>
     <string name="label_header">標題</string>
+
     <string name="link_whats_an_instance">什麼是站點？</string>
+
     <string name="login_connection">正在連線…</string>
+
     <string name="dialog_whats_an_instance">請輸入你帳號所在的 Mastodon 站點的域名或地址</string>
+
+
+
+
+
+
+
+
     <string name="dialog_title_finishing_media_upload">正在完成上傳…</string>
     <string name="dialog_message_uploading_media">正在上傳…</string>
     <string name="dialog_download_image">下載</string>
     <string name="dialog_message_cancel_follow_request">移除關注請求？</string>
     <string name="dialog_unfollow_warning">停止關注此使用者？</string>
     <string name="dialog_delete_toot_warning">刪除這條嘟文？</string>
+    <string name="dialog_redraft_toot_warning">刪除並重新編輯這條嘟文？</string>
+
     <string name="visibility_public">公開：所有人可見，並會出現在公開時間軸上</string>
     <string name="visibility_unlisted">不公開：所有人可見，但不會出現在公開時間軸上</string>
     <string name="visibility_private">僅關注者：只有經過你確認後關注你的使用者可見</string>
     <string name="visibility_direct">私信：只有被提及的使用者可見</string>
+
     <string name="pref_title_notification_settings">通知</string>
     <string name="pref_title_edit_notification_settings">通知設定</string>
     <string name="pref_title_notifications_enabled">通知</string>
@@ -149,13 +203,18 @@
     <string name="pref_title_appearance_settings">外觀</string>
     <string name="pref_title_app_theme">佈景主題</string>
     <string name="pref_title_timelines">時間軸</string>
+    <string name="pref_title_timeline_filters">過濾器</string>
+
     <string name="app_them_dark">黑夜</string>
     <string name="app_theme_light">白天</string>
-    <string name="app_theme_black">黑色</string>
+    <string name="app_theme_black">暗色</string>
     <string name="app_theme_auto">自動切換</string>
+    <string name="app_theme_system">跟隨系統</string>
+
     <string name="pref_title_browser_settings">瀏覽器</string>
     <string name="pref_title_custom_tabs">使用 Chrome Custom Tabs</string>
     <string name="pref_title_hide_follow_button">瀏覽時自動隱藏發嘟按鈕</string>
+    <string name="pref_title_language">語言</string>
     <string name="pref_title_status_filter">時間軸過濾</string>
     <string name="pref_title_status_tabs">標籤頁</string>
     <string name="pref_title_show_boosts">顯示轉嘟</string>
@@ -166,37 +225,48 @@
     <string name="pref_title_http_proxy_enable">啟用 HTTP 代理伺服器</string>
     <string name="pref_title_http_proxy_server">HTTP 代理伺服器</string>
     <string name="pref_title_http_proxy_port">HTTP 代理伺服器埠</string>
+
     <string name="pref_default_post_privacy">嘟文預設可見範圍</string>
     <string name="pref_default_media_sensitivity">總是將媒體標示為敏感</string>
     <string name="pref_publishing">發佈（與伺服器同步）</string>
     <string name="pref_failed_to_sync">同步設定失敗</string>
+
     <string name="post_privacy_public">公開</string>
     <string name="post_privacy_unlisted">不公開</string>
     <string name="post_privacy_followers_only">僅關注者</string>
+
     <string name="pref_status_text_size">字體大小</string>
+
     <string name="status_text_size_smallest">最小</string>
     <string name="status_text_size_small">小</string>
     <string name="status_text_size_medium">標準</string>
     <string name="status_text_size_large">大</string>
     <string name="status_text_size_largest">最大</string>
+
     <string name="pref_media_display">媒體顯示</string>
+
     <string name="media_hide_sensitive">自動隱藏敏感媒體</string>
     <string name="media_hide_none">總是顯示敏感媒體</string>
     <string name="media_hide_all">總是隱藏所有媒體</string>
-    <string name="notification_mention_name">被提及</string>
-    <string name="notification_mention_descriptions">當有使用者在嘟文中提及我時</string>
-    <string name="notification_follow_name">關注者</string>
-    <string name="notification_follow_description">當有使用者關注我時</string>
-    <string name="notification_boost_name">轉嘟</string>
-    <string name="notification_boost_description">當有使用者轉嘟了我的嘟文時</string>
-    <string name="notification_favourite_name">收藏</string>
-    <string name="notification_favourite_description">當有使用者收藏了我的嘟文時</string>
+
+    <string name="notification_channel_mention_name">被提及</string>
+    <string name="notification_channel_mention_descriptions">當有使用者在嘟文中提及我時</string>
+    <string name="notification_channel_follow_name">關注者</string>
+    <string name="notification_channel_follow_description">當有使用者關注我時</string>
+    <string name="notification_channel_boost_name">轉嘟</string>
+    <string name="notification_channel_boost_description">當有使用者轉嘟了我的嘟文時</string>
+    <string name="notification_channel_favourite_name">收藏</string>
+    <string name="notification_channel_favourite_description">當有使用者收藏了我的嘟文時</string>
+
+
     <string name="notification_mention_format">%s 提及了你</string>
     <string name="notification_summary_large">%1$s, %2$s, %3$s 和 %4$d 人</string>
     <string name="notification_summary_medium">%1$s, %2$s, 和 %3$s</string>
     <string name="notification_summary_small">%1$s 和 %2$s</string>
     <string name="notification_title_summary">%d 個新互動</string>
+
     <string name="description_account_locked">被鎖定的帳號</string>
+
     <string name="about_title_activity">關於 Tusky</string>
     <string name="about_tusky_license">Tusky 是基於 GNU General Public License Version 3 許可證開源的自由軟體完整的許可證協議：https://www.gnu.org/licenses/gpl-3.0.en.html</string>
     <!-- note to translators:
@@ -205,19 +275,28 @@
            to show we do not mean the software is gratis. Source: https://www.gnu.org/philosophy/free-sw.html
          * the url can be changed to link to the localized version of the license.
     -->
-    <string name="about_project_site">        專案網站：\n
+
+
+
+    <string name="about_project_site">
+        專案網站：\n
         https://tusky.app
     </string>
-    <string name="about_bug_feature_request_site">        問題回報：\n
+    <string name="about_bug_feature_request_site">
+        問題回報：\n
         https://github.com/tuskyapp/Tusky/issues
     </string>
     <string name="about_tusky_account">Tusky 官方帳號</string>
+
     <string name="status_share_content">分享嘟文內容</string>
     <string name="status_share_link">分享嘟文連結</string>
     <string name="status_media_images">照片</string>
     <string name="status_media_video">影片</string>
+
     <string name="state_follow_requested">已請求關注</string>
+
     <string name="no_content">沒有內容</string>
+
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
     <string name="abbreviated_in_years">%d 年內</string>
     <string name="abbreviated_in_days">%d 天內</string>
@@ -229,18 +308,48 @@
     <string name="abbreviated_hours_ago">%d 小時前</string>
     <string name="abbreviated_minutes_ago">%d 分鐘前</string>
     <string name="abbreviated_seconds_ago">%d 秒前</string>
+
+    <!--These are for timestamps on polls -->
+    <string name="timespan_days">%d 天</string>
+    <string name="timespan_hours">%d 小時</string>
+    <string name="timespan_minutes">%d 分鐘</string>
+    <string name="timespan_seconds">%d 秒</string>
+
     <string name="follows_you">關注了你</string>
     <string name="pref_title_alway_show_sensitive_media">總是顯示所有敏感媒體內容</string>
     <string name="title_media">媒體</string>
     <string name="replying_to">回覆 @%s</string>
     <string name="load_more_placeholder_text">載入更多</string>
+
+    <string name="pref_title_public_filter_keywords">公共時間軸</string>
+    <string name="pref_title_thread_filter_keywords">對話</string>
+    <string name="filter_addition_dialog_title">添加新的過濾器</string>
+    <string name="filter_edit_dialog_title">編輯過濾器</string>
+    <string name="filter_dialog_remove_button">移除</string>
+    <string name="filter_dialog_update_button">更新</string>
+    <string name="filter_add_description">需要過濾的文字</string>
+
     <string name="add_account_name">加入帳號</string>
     <string name="add_account_description">加入新的 Mastodon 帳號</string>
+
     <string name="action_lists">列表</string>
     <string name="title_lists">列表</string>
     <string name="title_list_timeline">列表公共時間軸</string>
+    <string name="error_create_list">無法新建列表</string>
+    <string name="error_rename_list">無法重命名列表</string>
+    <string name="error_delete_list">無法刪除列表</string>
+    <string name="action_create_list">新建列表</string>
+    <string name="action_rename_list">重命名列表</string>
+    <string name="action_delete_list">刪除列表</string>
+    <string name="action_edit_list">編輯列表</string>
+    <string name="hint_search_people_list">搜索已關注的用戶</string>
+    <string name="action_add_to_list">添加用戶到列表</string>
+    <string name="action_remove_from_list">從列表中移除用戶</string>
+
     <string name="compose_active_account_description">以 %1$s 發嘟文</string>
+
     <string name="error_failed_set_caption">設定圖片標題失敗</string>
+    <string name="hint_describe_for_visually_impaired">為視覺障礙用戶提供的描述\n(限制 %d 字)</string>
     <string name="action_set_caption">設定圖片標題</string>
     <string name="action_remove_media">移除</string>
     <string name="lock_account_label">保護你的帳戶（鎖嘟）</string>
@@ -252,6 +361,8 @@
     <string name="send_toot_notification_cancel_title">發送已被取消</string>
     <string name="send_toot_notification_saved_content">嘟文已儲存為草稿</string>
     <string name="action_compose_shortcut">撰寫嘟文</string>
+
+    <string name="error_no_custom_emojis">當前站點 %s 沒有自訂表情符號</string>
     <string name="copy_to_clipboard_success">已複製到剪貼簿</string>
     <string name="emoji_style">表情符號風格</string>
     <string name="system_default">系統預設</string>
@@ -266,19 +377,118 @@
     <string name="caption_systememoji">系統預設的表情符號包</string>
     <string name="caption_blobmoji">Android 4.4–7.1 的黃饅頭表情符號</string>
     <string name="caption_twemoji">Mastodon 使用的表情符號</string>
+    <!-- string name="emoji_shortcode_format" translatable="false">:%s:</string -->
+
     <string name="download_failed">下載失敗</string>
+
     <string name="profile_badge_bot_text">機器人</string>
     <string name="account_moved_description">%1$s 已遷移到：</string>
+
     <string name="reblog_private">轉嘟（可見者不變）</string>
     <string name="unreblog_private">取消轉嘟</string>
+
     <string name="license_description">Tusky 使用了以下開源專案的原始碼：</string>
     <string name="license_apache_2">以 Apache License 授權（詳見下方）</string>
+    <string name="license_cc_by_4">CC-BY 4.0</string>
+    <string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
+
     <string name="profile_metadata_label">個人資料附加資訊</string>
     <string name="profile_metadata_add">新增資訊</string>
     <string name="profile_metadata_label_label">標籤</string>
     <string name="profile_metadata_content_label">內容</string>
+
     <string name="pref_title_absolute_time">嘟文顯示精確時間</string>
+
     <string name="label_remote_account">以下資訊可能並不完整，要檢視完整資料請使用瀏覽器開啟</string>
+
     <string name="unpin_action">取消置頂</string>
     <string name="pin_action">置頂</string>
+
+    <plurals name="favs">
+        <item quantity="one">&lt;b>%1$s&lt;/b> 次收藏</item>
+        <item quantity="other">&lt;b>%1$s&lt;/b> 次收藏</item>
+    </plurals>
+
+    <plurals name="reblogs">
+        <item quantity="one">&lt;b>%s&lt;/b> 次轉嘟</item>
+        <item quantity="other">&lt;b>%s&lt;/b> 次轉嘟</item>
+    </plurals>
+
+    <string name="title_reblogged_by">轉嘟者</string>
+    <string name="title_favourited_by">收藏者</string>
+
+    <string name="conversation_1_recipients">%1$s</string>
+    <string name="conversation_2_recipients">%1$s 和 %2$s</string>
+    <string name="conversation_more_recipients">%1$s, %2$s 和 %3$d 等人</string>
+    <string name="max_tab_number_reached">標籤頁不能超過 %1$d 個</string>
+    
+    
+    <string name="description_status_media">
+        媒體: %s
+    </string>
+    <string name="description_status_cw">
+        內容提醒: %s
+    </string>
+    <string name="description_status_media_no_description_placeholder">
+        沒有媒體描述信息
+    </string>
+    <string name="description_status_reblogged">
+        被轉嘟
+    </string>
+    <string name="description_status_favourited">
+        被收藏
+    </string>
+    <string name="description_visiblity_public">
+        公開
+    </string>
+    <string name="description_visiblity_unlisted">
+        不公開
+    </string>
+    <string name="description_visiblity_private">
+        僅關注者
+    </string>
+    <string name="description_visiblity_direct">
+        私信
+    </string>
+    <string name="description_status">
+        <!-- Display name, cw?, content?, relative date, reposted by?, reposted?, favorited?, username, media?; visibility, fav number?, reblog number?-->
+        %1$s; %2$s; %3$s, %4$s, %5$s; %6$s, %7$s, %8$s, %9$s; %10$s, %11$s, %12$s
+    </string>
+    
+    <string name="hint_list_name">列表名</string>
+    
+    <string name="edit_hashtag_title">編輯話題</string>
+    <string name="edit_hashtag_hint">不帶 # 的話題名字</string>
+    <string name="hashtag">話題</string>
+    <string name="notifications_clear">清除</string>
+    <string name="notifications_apply_filter">過濾</string>
+    <string name="filter_favorites">@string/notification_channel_favourite_name</string>
+    <string name="filter_boosts">@string/notification_channel_boost_name</string>
+    <string name="filter_follows">@string/notification_channel_follow_name</string>
+    <string name="filter_mentions">@string/notification_channel_mention_name</string>
+    <string name="filter_apply">應用</string>
+    
+    <string name="compose_shortcut_long_label">發表新嘟文</string>
+    <string name="compose_shortcut_short_label">新嘟文</string>
+    <string name="pref_title_bot_overlay">顯示機器人標誌</string>
+    
+    <string name="notification_clear_text">你確定要永久清空通知列表嗎？</string>
+    
+    <string name="poll_info_format">
+        <!-- 15 votes • 1 hour left -->
+        %1$s • %2$s</string>
+    <plurals name="poll_info_votes">
+        <item quantity="one">%s 次投票</item>
+        <item quantity="other">%s 次投票</item>
+    </plurals>
+    <string name="poll_info_time_relative">剩餘 %s</string>
+    <string name="poll_info_time_absolute">%s 結束</string>
+    <string name="poll_info_closed">已結束</string>
+    <string name="poll_option_format">
+        <!-- 15% vote for this! -->
+        &lt;b>%1$d%%&lt;/b> %2$s</string>
+    
+    <string name="poll_vote">投票</string>
+
+
 </resources>
diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml
index 27b9019e..4580bbb5 100644
--- a/app/src/main/res/values-zh-rMO/strings.xml
+++ b/app/src/main/res/values-zh-rMO/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="error_generic">應用程式出現異常</string>
+    <string name="error_network">網絡請求出錯，請檢查互聯網連接並重試</string>
     <string name="error_empty">內容不能為空</string>
     <string name="error_invalid_domain">該域名無效</string>
     <string name="error_failed_app_registration">無法連接此伺服器</string>
@@ -20,14 +21,19 @@
     <string name="error_report_too_few_statuses">至少要檢舉 1 則嘟文</string>
     <string name="error_invalid_regex">正規表示式無效</string>
     <string name="error_sender_account_gone">嘟文發送時出錯</string>
+
     <string name="title_home">主頁</string>
     <string name="title_advanced">進階</string>
     <string name="title_notifications">通知</string>
     <string name="title_public_local">本站時間軸</string>
     <string name="title_public_federated">跨站公開時間軸</string>
+    <string name="title_direct_messages">私信</string>
+    <string name="title_tab_preferences">標籤頁</string>
     <string name="title_view_thread">嘟文</string>
+    <string name="title_tag">#%s</string>
     <string name="title_statuses">嘟文</string>
     <string name="title_statuses_with_replies">嘟文和回覆</string>
+    <string name="title_statuses_pinned">已置顶</string>
     <string name="title_follows">正在關注</string>
     <string name="title_followers">關注者</string>
     <string name="title_favourites">我的收藏</string>
@@ -37,6 +43,8 @@
     <string name="title_edit_profile">編輯個人資料</string>
     <string name="title_saved_toot">草稿</string>
     <string name="title_licenses">開源授權</string>
+
+    <string name="status_username_format">\@%s</string>
     <string name="status_boosted_format">%s 轉嘟了</string>
     <string name="status_sensitive_media_title">敏感內容</string>
     <string name="status_media_hidden_title">已隱藏的照片或影片</string>
@@ -45,16 +53,23 @@
     <string name="status_content_warning_show_less">摺疊內容</string>
     <string name="status_content_show_more">展開</string>
     <string name="status_content_show_less">摺疊</string>
+
+    <string name="message_empty">沒有內容</string>
     <string name="footer_empty">還沒有內容，向下拉動即可重新整理</string>
+
     <string name="notification_reblog_format">%s 轉嘟了你的嘟文</string>
     <string name="notification_favourite_format">%s 收藏了你的嘟文</string>
     <string name="notification_follow_format">%s 關注了你</string>
+
     <string name="report_username_format">檢舉使用者 @%s 的濫用行為</string>
     <string name="report_comment_hint">更多評論？</string>
+
     <string name="action_quick_reply">快速回覆</string>
     <string name="action_reply">回覆</string>
     <string name="action_reblog">轉嘟</string>
+    <string name="action_unreblog">取消轉嘟</string>
     <string name="action_favourite">收藏</string>
+    <string name="action_unfavourite">取消收藏</string>
     <string name="action_more">更多</string>
     <string name="action_compose">發表新嘟文</string>
     <string name="action_login">登入 Mastodon 帳號</string>
@@ -68,6 +83,7 @@
     <string name="action_show_reblogs">顯示轉嘟</string>
     <string name="action_report">檢舉</string>
     <string name="action_delete">刪除</string>
+    <string name="action_delete_and_redraft">刪除並重新編輯</string>
     <string name="action_send">發嘟</string>
     <string name="action_send_public">發嘟！</string>
     <string name="action_retry">重試</string>
@@ -100,39 +116,77 @@
     <string name="action_toggle_visibility">設定嘟文可見範圍</string>
     <string name="action_content_warning">設定敏感內容警告</string>
     <string name="action_emoji_keyboard">插入表情符號</string>
+    <string name="action_add_tab">新增標籤頁</string>
+    <string name="action_links">連結</string>
+    <string name="action_mentions">提及</string>
+    <string name="action_hashtags">話題</string>
+    <string name="action_open_reblogger">打開轉嘟者主頁</string>
+    <string name="action_open_reblogged_by">顯示轉嘟者</string>
+    <string name="action_open_faved_by">顯示收藏者</string>
+
+    <string name="title_hashtags_dialog">話題</string>
+    <string name="title_mentions_dialog">提及</string>
+    <string name="title_links_dialog">連結</string>
+    <string name="action_open_media_n">打開媒體 #%d</string>
+
     <string name="download_image">正在下載 %1$s…</string>
+
     <string name="action_copy_link">複製連結</string>
+    <string name="action_open_as">打開為 %s</string>
+    <string name="action_share_as">分享為 …</string>
+    <string name="download_media">下載媒體</string>
+    <string name="downloading_media">正在下載媒體</string>
+
     <string name="send_status_link_to">分享連結到…</string>
     <string name="send_status_content_to">分享嘟文到…</string>
     <string name="send_media_to">分享媒體到…</string>
+
     <string name="confirmation_reported">已檢舉！</string>
     <string name="confirmation_unblocked">已解除封鎖</string>
     <string name="confirmation_unmuted">已解除靜音</string>
+
     <string name="status_sent">已發送！</string>
     <string name="status_sent_long">成功送出回覆</string>
+
     <string name="hint_domain">域名</string>
     <string name="hint_compose">有什麼新鮮事？</string>
     <string name="hint_content_warning">敏感內容警告</string>
     <string name="hint_display_name">暱稱</string>
     <string name="hint_note">簡介</string>
     <string name="hint_search">搜尋…</string>
+
     <string name="search_no_results">沒找到結果</string>
+
     <string name="label_quick_reply">回覆…</string>
     <string name="label_avatar">頭像</string>
     <string name="label_header">標題</string>
+
     <string name="link_whats_an_instance">什麼是站點？</string>
+
     <string name="login_connection">正在連線…</string>
+
     <string name="dialog_whats_an_instance">請輸入你帳號所在的 Mastodon 站點的域名或地址</string>
+
+
+
+
+
+
+
+
     <string name="dialog_title_finishing_media_upload">正在完成上傳…</string>
     <string name="dialog_message_uploading_media">正在上傳…</string>
     <string name="dialog_download_image">下載</string>
     <string name="dialog_message_cancel_follow_request">移除關注請求？</string>
     <string name="dialog_unfollow_warning">停止關注此使用者？</string>
     <string name="dialog_delete_toot_warning">刪除這條嘟文？</string>
+    <string name="dialog_redraft_toot_warning">刪除並重新編輯這條嘟文？</string>
+
     <string name="visibility_public">公開：所有人可見，並會出現在公開時間軸上</string>
     <string name="visibility_unlisted">不公開：所有人可見，但不會出現在公開時間軸上</string>
     <string name="visibility_private">僅關注者：只有經過你確認後關注你的使用者可見</string>
     <string name="visibility_direct">私信：只有被提及的使用者可見</string>
+
     <string name="pref_title_notification_settings">通知</string>
     <string name="pref_title_edit_notification_settings">通知設定</string>
     <string name="pref_title_notifications_enabled">通知</string>
@@ -149,13 +203,18 @@
     <string name="pref_title_appearance_settings">外觀</string>
     <string name="pref_title_app_theme">佈景主題</string>
     <string name="pref_title_timelines">時間軸</string>
+    <string name="pref_title_timeline_filters">過濾器</string>
+
     <string name="app_them_dark">黑夜</string>
     <string name="app_theme_light">白天</string>
-    <string name="app_theme_black">黑色</string>
+    <string name="app_theme_black">暗色</string>
     <string name="app_theme_auto">自動切換</string>
+    <string name="app_theme_system">跟隨系統</string>
+
     <string name="pref_title_browser_settings">瀏覽器</string>
     <string name="pref_title_custom_tabs">使用 Chrome Custom Tabs</string>
     <string name="pref_title_hide_follow_button">瀏覽時自動隱藏發嘟按鈕</string>
+    <string name="pref_title_language">語言</string>
     <string name="pref_title_status_filter">時間軸過濾</string>
     <string name="pref_title_status_tabs">標籤頁</string>
     <string name="pref_title_show_boosts">顯示轉嘟</string>
@@ -166,37 +225,48 @@
     <string name="pref_title_http_proxy_enable">啟用 HTTP 代理伺服器</string>
     <string name="pref_title_http_proxy_server">HTTP 代理伺服器</string>
     <string name="pref_title_http_proxy_port">HTTP 代理伺服器埠</string>
+
     <string name="pref_default_post_privacy">嘟文預設可見範圍</string>
     <string name="pref_default_media_sensitivity">總是將媒體標示為敏感</string>
     <string name="pref_publishing">發佈（與伺服器同步）</string>
     <string name="pref_failed_to_sync">同步設定失敗</string>
+
     <string name="post_privacy_public">公開</string>
     <string name="post_privacy_unlisted">不公開</string>
     <string name="post_privacy_followers_only">僅關注者</string>
+
     <string name="pref_status_text_size">字體大小</string>
+
     <string name="status_text_size_smallest">最小</string>
     <string name="status_text_size_small">小</string>
     <string name="status_text_size_medium">標準</string>
     <string name="status_text_size_large">大</string>
     <string name="status_text_size_largest">最大</string>
+
     <string name="pref_media_display">媒體顯示</string>
+
     <string name="media_hide_sensitive">自動隱藏敏感媒體</string>
     <string name="media_hide_none">總是顯示敏感媒體</string>
     <string name="media_hide_all">總是隱藏所有媒體</string>
-    <string name="notification_mention_name">被提及</string>
-    <string name="notification_mention_descriptions">當有使用者在嘟文中提及我時</string>
-    <string name="notification_follow_name">關注者</string>
-    <string name="notification_follow_description">當有使用者關注我時</string>
-    <string name="notification_boost_name">轉嘟</string>
-    <string name="notification_boost_description">當有使用者轉嘟了我的嘟文時</string>
-    <string name="notification_favourite_name">收藏</string>
-    <string name="notification_favourite_description">當有使用者收藏了我的嘟文時</string>
+
+    <string name="notification_channel_mention_name">被提及</string>
+    <string name="notification_channel_mention_descriptions">當有使用者在嘟文中提及我時</string>
+    <string name="notification_channel_follow_name">關注者</string>
+    <string name="notification_channel_follow_description">當有使用者關注我時</string>
+    <string name="notification_channel_boost_name">轉嘟</string>
+    <string name="notification_channel_boost_description">當有使用者轉嘟了我的嘟文時</string>
+    <string name="notification_channel_favourite_name">收藏</string>
+    <string name="notification_channel_favourite_description">當有使用者收藏了我的嘟文時</string>
+
+
     <string name="notification_mention_format">%s 提及了你</string>
     <string name="notification_summary_large">%1$s, %2$s, %3$s 和 %4$d 人</string>
     <string name="notification_summary_medium">%1$s, %2$s, 和 %3$s</string>
     <string name="notification_summary_small">%1$s 和 %2$s</string>
     <string name="notification_title_summary">%d 個新互動</string>
+
     <string name="description_account_locked">被鎖定的帳號</string>
+
     <string name="about_title_activity">關於 Tusky</string>
     <string name="about_tusky_license">Tusky 是基於 GNU General Public License Version 3 許可證開源的自由軟體完整的許可證協議：https://www.gnu.org/licenses/gpl-3.0.en.html</string>
     <!-- note to translators:
@@ -205,19 +275,28 @@
            to show we do not mean the software is gratis. Source: https://www.gnu.org/philosophy/free-sw.html
          * the url can be changed to link to the localized version of the license.
     -->
-    <string name="about_project_site">        專案網站：\n
+
+
+
+    <string name="about_project_site">
+        專案網站：\n
         https://tusky.app
     </string>
-    <string name="about_bug_feature_request_site">        問題回報：\n
+    <string name="about_bug_feature_request_site">
+        問題回報：\n
         https://github.com/tuskyapp/Tusky/issues
     </string>
     <string name="about_tusky_account">Tusky 官方帳號</string>
+
     <string name="status_share_content">分享嘟文內容</string>
     <string name="status_share_link">分享嘟文連結</string>
     <string name="status_media_images">照片</string>
     <string name="status_media_video">影片</string>
+
     <string name="state_follow_requested">已請求關注</string>
+
     <string name="no_content">沒有內容</string>
+
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
     <string name="abbreviated_in_years">%d 年內</string>
     <string name="abbreviated_in_days">%d 天內</string>
@@ -229,18 +308,48 @@
     <string name="abbreviated_hours_ago">%d 小時前</string>
     <string name="abbreviated_minutes_ago">%d 分鐘前</string>
     <string name="abbreviated_seconds_ago">%d 秒前</string>
+
+    <!--These are for timestamps on polls -->
+    <string name="timespan_days">%d 天</string>
+    <string name="timespan_hours">%d 小時</string>
+    <string name="timespan_minutes">%d 分鐘</string>
+    <string name="timespan_seconds">%d 秒</string>
+
     <string name="follows_you">關注了你</string>
     <string name="pref_title_alway_show_sensitive_media">總是顯示所有敏感媒體內容</string>
     <string name="title_media">媒體</string>
     <string name="replying_to">回覆 @%s</string>
     <string name="load_more_placeholder_text">載入更多</string>
+
+    <string name="pref_title_public_filter_keywords">公共時間軸</string>
+    <string name="pref_title_thread_filter_keywords">對話</string>
+    <string name="filter_addition_dialog_title">添加新的過濾器</string>
+    <string name="filter_edit_dialog_title">編輯過濾器</string>
+    <string name="filter_dialog_remove_button">移除</string>
+    <string name="filter_dialog_update_button">更新</string>
+    <string name="filter_add_description">需要過濾的文字</string>
+
     <string name="add_account_name">加入帳號</string>
     <string name="add_account_description">加入新的 Mastodon 帳號</string>
+
     <string name="action_lists">列表</string>
     <string name="title_lists">列表</string>
     <string name="title_list_timeline">列表公共時間軸</string>
+    <string name="error_create_list">無法新建列表</string>
+    <string name="error_rename_list">無法重命名列表</string>
+    <string name="error_delete_list">無法刪除列表</string>
+    <string name="action_create_list">新建列表</string>
+    <string name="action_rename_list">重命名列表</string>
+    <string name="action_delete_list">刪除列表</string>
+    <string name="action_edit_list">編輯列表</string>
+    <string name="hint_search_people_list">搜索已關注的用戶</string>
+    <string name="action_add_to_list">添加用戶到列表</string>
+    <string name="action_remove_from_list">從列表中移除用戶</string>
+
     <string name="compose_active_account_description">以 %1$s 發嘟文</string>
+
     <string name="error_failed_set_caption">設定圖片標題失敗</string>
+    <string name="hint_describe_for_visually_impaired">為視覺障礙用戶提供的描述\n(限制 %d 字)</string>
     <string name="action_set_caption">設定圖片標題</string>
     <string name="action_remove_media">移除</string>
     <string name="lock_account_label">保護你的帳戶（鎖嘟）</string>
@@ -252,6 +361,8 @@
     <string name="send_toot_notification_cancel_title">發送已被取消</string>
     <string name="send_toot_notification_saved_content">嘟文已儲存為草稿</string>
     <string name="action_compose_shortcut">撰寫嘟文</string>
+
+    <string name="error_no_custom_emojis">當前站點 %s 沒有自訂表情符號</string>
     <string name="copy_to_clipboard_success">已複製到剪貼簿</string>
     <string name="emoji_style">表情符號風格</string>
     <string name="system_default">系統預設</string>
@@ -266,19 +377,118 @@
     <string name="caption_systememoji">系統預設的表情符號包</string>
     <string name="caption_blobmoji">Android 4.4–7.1 的黃饅頭表情符號</string>
     <string name="caption_twemoji">Mastodon 使用的表情符號</string>
+    <!-- string name="emoji_shortcode_format" translatable="false">:%s:</string -->
+
     <string name="download_failed">下載失敗</string>
+
     <string name="profile_badge_bot_text">機器人</string>
     <string name="account_moved_description">%1$s 已遷移到：</string>
+
     <string name="reblog_private">轉嘟（可見者不變）</string>
     <string name="unreblog_private">取消轉嘟</string>
+
     <string name="license_description">Tusky 使用了以下開源專案的原始碼：</string>
     <string name="license_apache_2">以 Apache License 授權（詳見下方）</string>
+    <string name="license_cc_by_4">CC-BY 4.0</string>
+    <string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
+
     <string name="profile_metadata_label">個人資料附加資訊</string>
     <string name="profile_metadata_add">新增資訊</string>
     <string name="profile_metadata_label_label">標籤</string>
     <string name="profile_metadata_content_label">內容</string>
+
     <string name="pref_title_absolute_time">嘟文顯示精確時間</string>
+
     <string name="label_remote_account">以下資訊可能並不完整，要檢視完整資料請使用瀏覽器開啟</string>
+
     <string name="unpin_action">取消置頂</string>
     <string name="pin_action">置頂</string>
+
+    <plurals name="favs">
+        <item quantity="one">&lt;b>%1$s&lt;/b> 次收藏</item>
+        <item quantity="other">&lt;b>%1$s&lt;/b> 次收藏</item>
+    </plurals>
+
+    <plurals name="reblogs">
+        <item quantity="one">&lt;b>%s&lt;/b> 次轉嘟</item>
+        <item quantity="other">&lt;b>%s&lt;/b> 次轉嘟</item>
+    </plurals>
+
+    <string name="title_reblogged_by">轉嘟者</string>
+    <string name="title_favourited_by">收藏者</string>
+
+    <string name="conversation_1_recipients">%1$s</string>
+    <string name="conversation_2_recipients">%1$s 和 %2$s</string>
+    <string name="conversation_more_recipients">%1$s, %2$s 和 %3$d 等人</string>
+    <string name="max_tab_number_reached">標籤頁不能超過 %1$d 個</string>
+    
+    
+    <string name="description_status_media">
+        媒體: %s
+    </string>
+    <string name="description_status_cw">
+        內容提醒: %s
+    </string>
+    <string name="description_status_media_no_description_placeholder">
+        沒有媒體描述信息
+    </string>
+    <string name="description_status_reblogged">
+        被轉嘟
+    </string>
+    <string name="description_status_favourited">
+        被收藏
+    </string>
+    <string name="description_visiblity_public">
+        公開
+    </string>
+    <string name="description_visiblity_unlisted">
+        不公開
+    </string>
+    <string name="description_visiblity_private">
+        僅關注者
+    </string>
+    <string name="description_visiblity_direct">
+        私信
+    </string>
+    <string name="description_status">
+        <!-- Display name, cw?, content?, relative date, reposted by?, reposted?, favorited?, username, media?; visibility, fav number?, reblog number?-->
+        %1$s; %2$s; %3$s, %4$s, %5$s; %6$s, %7$s, %8$s, %9$s; %10$s, %11$s, %12$s
+    </string>
+    
+    <string name="hint_list_name">列表名</string>
+    
+    <string name="edit_hashtag_title">編輯話題</string>
+    <string name="edit_hashtag_hint">不帶 # 的話題名字</string>
+    <string name="hashtag">話題</string>
+    <string name="notifications_clear">清除</string>
+    <string name="notifications_apply_filter">過濾</string>
+    <string name="filter_favorites">@string/notification_channel_favourite_name</string>
+    <string name="filter_boosts">@string/notification_channel_boost_name</string>
+    <string name="filter_follows">@string/notification_channel_follow_name</string>
+    <string name="filter_mentions">@string/notification_channel_mention_name</string>
+    <string name="filter_apply">應用</string>
+    
+    <string name="compose_shortcut_long_label">發表新嘟文</string>
+    <string name="compose_shortcut_short_label">新嘟文</string>
+    <string name="pref_title_bot_overlay">顯示機器人標誌</string>
+    
+    <string name="notification_clear_text">你確定要永久清空通知列表嗎？</string>
+    
+    <string name="poll_info_format">
+        <!-- 15 votes • 1 hour left -->
+        %1$s • %2$s</string>
+    <plurals name="poll_info_votes">
+        <item quantity="one">%s 次投票</item>
+        <item quantity="other">%s 次投票</item>
+    </plurals>
+    <string name="poll_info_time_relative">剩餘 %s</string>
+    <string name="poll_info_time_absolute">%s 結束</string>
+    <string name="poll_info_closed">已結束</string>
+    <string name="poll_option_format">
+        <!-- 15% vote for this! -->
+        &lt;b>%1$d%%&lt;/b> %2$s</string>
+    
+    <string name="poll_vote">投票</string>
+
+
 </resources>
diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml
index 83e0f209..44452765 100644
--- a/app/src/main/res/values-zh-rSG/strings.xml
+++ b/app/src/main/res/values-zh-rSG/strings.xml
@@ -1,33 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="error_generic">应用程序出现异常。</string>
-    <string name="error_empty">内容不能为空。</string>
+    <string name="error_generic">应用程序出现异常</string>
+    <string name="error_network">网络请求出错，请检查互联网连接并重试</string>
+    <string name="error_empty">内容不能为空</string>
     <string name="error_invalid_domain">该域名无效</string>
-    <string name="error_failed_app_registration">无法连接此服务器。</string>
-    <string name="error_no_web_browser_found">没有可用的浏览器。</string>
-    <string name="error_authorization_unknown">认证过程出现未知错误。</string>
-    <string name="error_authorization_denied">授权被拒绝。</string>
-    <string name="error_retrieving_oauth_token">无法获取登录信息。</string>
+    <string name="error_failed_app_registration">无法连接此服务器</string>
+    <string name="error_no_web_browser_found">没有可用的浏览器</string>
+    <string name="error_authorization_unknown">认证过程出现未知错误</string>
+    <string name="error_authorization_denied">授权被拒绝</string>
+    <string name="error_retrieving_oauth_token">无法获取登录信息</string>
     <string name="error_compose_character_limit">嘟文太长了！</string>
-    <string name="error_image_upload_size">文件大小限制 8MB。</string>
-    <string name="error_video_upload_size">视频文件大小限制 40MB。</string>
-    <string name="error_media_upload_type">无法上传此类型的文件。</string>
-    <string name="error_media_upload_opening">此文件无法打开。</string>
-    <string name="error_media_upload_permission">需要授予 Tusky 读取媒体文件的权限。</string>
-    <string name="error_media_download_permission">需要授予 Tusky 写入存储空间的权限。</string>
-    <string name="error_media_upload_image_or_video">无法在嘟文中同时插入视频和图片。</string>
-    <string name="error_media_upload_sending">媒体文件上传失败。</string>
-    <string name="error_report_too_few_statuses">至少要报告 1 则嘟文。</string>
+    <string name="error_image_upload_size">文件大小限制 8MB</string>
+    <string name="error_video_upload_size">视频文件大小限制 40MB</string>
+    <string name="error_media_upload_type">无法上传此类型的文件</string>
+    <string name="error_media_upload_opening">此文件无法打开</string>
+    <string name="error_media_upload_permission">需要授予 Tusky 读取媒体文件的权限</string>
+    <string name="error_media_download_permission">需要授予 Tusky 写入存储空间的权限</string>
+    <string name="error_media_upload_image_or_video">无法在嘟文中同时插入视频和图片</string>
+    <string name="error_media_upload_sending">媒体文件上传失败</string>
+    <string name="error_report_too_few_statuses">至少要报告 1 则嘟文</string>
     <string name="error_invalid_regex">正则表达式无效</string>
-    <string name="error_sender_account_gone">嘟文发送时出错。</string>
+    <string name="error_sender_account_gone">嘟文发送时出错</string>
+
     <string name="title_home">主页</string>
     <string name="title_advanced">高级</string>
     <string name="title_notifications">通知</string>
     <string name="title_public_local">本站时间轴</string>
-    <string name="title_public_federated">跨站公共时间线</string>
+    <string name="title_public_federated">跨站公共时间轴</string>
+    <string name="title_direct_messages">私信</string>
+    <string name="title_tab_preferences">标签页</string>
     <string name="title_view_thread">嘟文</string>
+    <string name="title_tag">#%s</string>
     <string name="title_statuses">嘟文</string>
     <string name="title_statuses_with_replies">嘟文和回复</string>
+    <string name="title_statuses_pinned">已置顶</string>
     <string name="title_follows">正在关注</string>
     <string name="title_followers">关注者</string>
     <string name="title_favourites">我的收藏</string>
@@ -37,6 +43,8 @@
     <string name="title_edit_profile">编辑个人资料</string>
     <string name="title_saved_toot">草稿</string>
     <string name="title_licenses">开源协议</string>
+
+    <string name="status_username_format">\@%s</string>
     <string name="status_boosted_format">%s 转嘟了</string>
     <string name="status_sensitive_media_title">敏感内容</string>
     <string name="status_media_hidden_title">已隐藏的照片或视频</string>
@@ -45,16 +53,23 @@
     <string name="status_content_warning_show_less">折叠内容</string>
     <string name="status_content_show_more">展开</string>
     <string name="status_content_show_less">折叠</string>
-    <string name="footer_empty">还没有内容，向下滑动即可刷新。</string>
+
+    <string name="message_empty">还没有内容</string>
+    <string name="footer_empty">还没有内容，向下拉动即可刷新</string>
+
     <string name="notification_reblog_format">%s 转嘟了你的嘟文</string>
     <string name="notification_favourite_format">%s 收藏了你的嘟文</string>
     <string name="notification_follow_format">%s 关注了你</string>
+
     <string name="report_username_format">报告用户 @%s 的滥用行为</string>
     <string name="report_comment_hint">报告更多信息</string>
-    <string name="action_quick_reply">快捷回复</string>
+
+    <string name="action_quick_reply">快速回复</string>
     <string name="action_reply">回复</string>
     <string name="action_reblog">转嘟</string>
+    <string name="action_unreblog">取消转嘟</string>
     <string name="action_favourite">收藏</string>
+    <string name="action_unfavourite">取消收藏</string>
     <string name="action_more">更多</string>
     <string name="action_compose">发表新嘟文</string>
     <string name="action_login">登录 Mastodon 帐号</string>
@@ -68,8 +83,9 @@
     <string name="action_show_reblogs">显示转嘟</string>
     <string name="action_report">报告</string>
     <string name="action_delete">删除</string>
+    <string name="action_delete_and_redraft">删除并重新编辑</string>
     <string name="action_send">发嘟</string>
-    <string name="action_send_public">发嘟</string>
+    <string name="action_send_public">发嘟！</string>
     <string name="action_retry">重试</string>
     <string name="action_close">关闭</string>
     <string name="action_view_profile">个人资料</string>
@@ -99,43 +115,78 @@
     <string name="action_access_saved_toot">草稿</string>
     <string name="action_toggle_visibility">设置嘟文可见范围</string>
     <string name="action_content_warning">设置内容提醒信息</string>
-    <string name="action_emoji_keyboard">插入 Emoji 表情</string>
+    <string name="action_emoji_keyboard">插入表情符号</string>
+    <string name="action_add_tab">添加标签页</string>
+    <string name="action_links">链接</string>
+    <string name="action_mentions">提及</string>
+    <string name="action_hashtags">话题</string>
+    <string name="action_open_reblogger">打开转发者主页</string>
+    <string name="action_open_reblogged_by">显示转发者</string>
+    <string name="action_open_faved_by">显示收藏者</string>
+
+    <string name="title_hashtags_dialog">话题</string>
+    <string name="title_mentions_dialog">提及</string>
+    <string name="title_links_dialog">链接</string>
+    <string name="action_open_media_n">打开媒体文件 #%d</string>
+
     <string name="download_image">正在下载 %1$s…</string>
+
     <string name="action_copy_link">复制链接</string>
+    <string name="action_open_as">打开为 %s</string>
+    <string name="action_share_as">分享为 …</string>
+    <string name="download_media">下载媒体文件</string>
+    <string name="downloading_media">正在下载媒体文件</string>
+
     <string name="send_status_link_to">分享链接到…</string>
     <string name="send_status_content_to">分享嘟文到…</string>
     <string name="send_media_to">分享媒体到…</string>
+
     <string name="confirmation_reported">报告已发送！</string>
     <string name="confirmation_unblocked">已解除屏蔽</string>
     <string name="confirmation_unmuted">已取消隐藏</string>
+
     <string name="status_sent">已发送！</string>
-    <string name="status_sent_long">成功发布回复。</string>
+    <string name="status_sent_long">成功发布回复</string>
+
     <string name="hint_domain">域名</string>
     <string name="hint_compose">有什么新鲜事？</string>
     <string name="hint_content_warning">内容提醒</string>
     <string name="hint_display_name">昵称</string>
     <string name="hint_note">简介</string>
     <string name="hint_search">搜索…</string>
+
     <string name="search_no_results">没找到结果</string>
+
     <string name="label_quick_reply">回复…</string>
     <string name="label_avatar">头像</string>
     <string name="label_header">标题</string>
+
     <string name="link_whats_an_instance">需要帮助？</string>
+
     <string name="login_connection">正在连接…</string>
-    <string name="dialog_whats_an_instance">请输入你帐号所在的 Mastodon 站点的域名，比如 pawoo.net，mstdn.jp，mao.daizhige.org，<a href="https://instances.social">等等</a> 。
-        \n\n还没有 Mastodon 帐号？你也可以输入想注册的 Mastodon 站点的域名，然后在该服务器创建新的帐号并授权 Tusky 登入。
+
+    <string name="dialog_whats_an_instance">请输入你帐号所在的 Mastodon 站点的域名，比如 pawoo.net，acg.mn，wxw.moe，<a href="https://instances.social">等等</a> 。
+        \n\n还没有 Mastodon 帐号？你也可以输入想注册的 Mastodon 站点的域名，然后在该服务器创建新的帐号并授权 Tusky 登入
         \n\n在 Mastodon 里，跨站互动和站内互动一样简单。可以前往 <a href="https://joinmastodon.org">https://joinmastodon.org</a> 了解更多信息。
     </string>
+
+
+
+
+
     <string name="dialog_title_finishing_media_upload">正在结束上传…</string>
     <string name="dialog_message_uploading_media">正在上传…</string>
     <string name="dialog_download_image">下载</string>
     <string name="dialog_message_cancel_follow_request">移除关注请求？</string>
     <string name="dialog_unfollow_warning">不再关注此用户？</string>
     <string name="dialog_delete_toot_warning">删除这条嘟文？</string>
+    <string name="dialog_redraft_toot_warning">删除并重新编辑这条嘟文？</string>
+
     <string name="visibility_public">公开：所有人可见，并会出现在公共时间轴上</string>
     <string name="visibility_unlisted">不公开：所有人可见，但不会出现在公共时间轴上</string>
     <string name="visibility_private">仅关注者：只有经过你确认后关注你的用户可见</string>
     <string name="visibility_direct">私信：只有被提及的用户可见</string>
+
     <string name="pref_title_notification_settings">通知</string>
     <string name="pref_title_edit_notification_settings">通知设置</string>
     <string name="pref_title_notifications_enabled">通知</string>
@@ -151,16 +202,21 @@
     <string name="pref_title_notification_filter_favourites">嘟文被收藏</string>
     <string name="pref_title_appearance_settings">外观</string>
     <string name="pref_title_app_theme">应用主题</string>
-    <string name="pref_title_timelines">时间线</string>
+    <string name="pref_title_timelines">时间轴</string>
+    <string name="pref_title_timeline_filters">过滤器</string>
+
     <string name="app_them_dark">黑夜</string>
     <string name="app_theme_light">白天</string>
-    <string name="app_theme_black">黑色</string>
+    <string name="app_theme_black">暗色</string>
     <string name="app_theme_auto">自动切换</string>
+    <string name="app_theme_system">跟随系统设定</string>
+
     <string name="pref_title_browser_settings">浏览器</string>
     <string name="pref_title_custom_tabs">使用 Chrome Custom Tabs</string>
     <string name="pref_title_hide_follow_button">浏览时自动隐藏发嘟按钮</string>
-    <string name="pref_title_status_filter">时间线过滤</string>
-    <string name="pref_title_status_tabs">选项卡</string>
+    <string name="pref_title_language">界面语言</string>
+    <string name="pref_title_status_filter">时间轴过滤</string>
+    <string name="pref_title_status_tabs">标签页</string>
     <string name="pref_title_show_boosts">显示转嘟</string>
     <string name="pref_title_show_replies">显示回复</string>
     <string name="pref_title_show_media_preview">显示预览图</string>
@@ -169,57 +225,78 @@
     <string name="pref_title_http_proxy_enable">启用 HTTP 代理</string>
     <string name="pref_title_http_proxy_server">HTTP 代理服务器</string>
     <string name="pref_title_http_proxy_port">HTTP 代理端口</string>
+
     <string name="pref_default_post_privacy">嘟文默认可见范围</string>
-    <string name="pref_publishing">发布</string>
-    <string name="pref_failed_to_sync">同步失败设置</string>
+    <string name="pref_default_media_sensitivity">自动标记媒体为敏感内容</string>
+    <string name="pref_publishing">发布（与服务器同步）</string>
+    <string name="pref_failed_to_sync">同步设置失败</string>
+
     <string name="post_privacy_public">公开</string>
     <string name="post_privacy_unlisted">不公开</string>
     <string name="post_privacy_followers_only">仅关注者</string>
+
     <string name="pref_status_text_size">字体大小</string>
+
     <string name="status_text_size_smallest">最小</string>
     <string name="status_text_size_small">小</string>
     <string name="status_text_size_medium">标准</string>
     <string name="status_text_size_large">大</string>
     <string name="status_text_size_largest">最大</string>
+
     <string name="pref_media_display">媒体显示</string>
+
     <string name="media_hide_sensitive">自动隐藏敏感媒体</string>
     <string name="media_hide_none">总是显示敏感媒体</string>
     <string name="media_hide_all">总是隐藏所有媒体</string>
-    <string name="notification_mention_name">被提及</string>
-    <string name="notification_mention_descriptions">当有用户在嘟文中提及我时</string>
-    <string name="notification_follow_name">关注者</string>
-    <string name="notification_follow_description">当有用户关注我时</string>
-    <string name="notification_boost_name">转嘟</string>
-    <string name="notification_boost_description">当有用户转嘟了我的嘟文时</string>
-    <string name="notification_favourite_name">被收藏</string>
-    <string name="notification_favourite_description">当有用户收藏了我的嘟文时</string>
+
+    <string name="notification_channel_mention_name">被提及</string>
+    <string name="notification_channel_mention_descriptions">当有用户在嘟文中提及我时</string>
+    <string name="notification_channel_follow_name">关注者</string>
+    <string name="notification_channel_follow_description">当有用户关注我时</string>
+    <string name="notification_channel_boost_name">转嘟</string>
+    <string name="notification_channel_boost_description">当有用户转嘟了我的嘟文时</string>
+    <string name="notification_channel_favourite_name">收藏</string>
+    <string name="notification_channel_favourite_description">当有用户收藏了我的嘟文时</string>
+
+
     <string name="notification_mention_format">%s 提及了你</string>
     <string name="notification_summary_large">%1$s, %2$s, %3$s 和 %4$d 人</string>
     <string name="notification_summary_medium">%1$s, %2$s, 和 %3$s</string>
     <string name="notification_summary_small">%1$s 和 %2$s</string>
     <string name="notification_title_summary">%d 个新互动</string>
+
     <string name="description_account_locked">被锁定的帐号</string>
+
     <string name="about_title_activity">关于 Tusky</string>
+    <string name="about_tusky_version">Tusky %s</string>
     <string name="about_tusky_license">Tusky 是基于 GNU General Public License Version 3 许可证开源的自由软件。完整的许可证协议：https://www.gnu.org/licenses/gpl-3.0.en.html</string>
+
+
     <!-- note to translators:
          * you should think of “free” as in “free speech,” not as in “free beer”.
            We sometimes call it “libre software,” borrowing the French or Spanish word for “free” as in freedom,
            to show we do not mean the software is gratis. Source: https://www.gnu.org/philosophy/free-sw.html
          * the url can be changed to link to the localized version of the license.
     -->
-    <string name="about_project_site">        项目地址：\n
+    <string name="about_project_site">
+        项目地址：\n
         https://tusky.app
     </string>
-    <string name="about_bug_feature_request_site">        问题反馈：\n
+    <string name="about_bug_feature_request_site">
+        问题反馈：\n
         https://github.com/tuskyapp/Tusky/issues
     </string>
     <string name="about_tusky_account">Tusky 官方帐号</string>
+
     <string name="status_share_content">分享嘟文内容</string>
     <string name="status_share_link">分享嘟文链接</string>
     <string name="status_media_images">照片</string>
     <string name="status_media_video">视频</string>
+
     <string name="state_follow_requested">已发送关注请求</string>
-    <string name="no_content">无内容</string>
+
+    <string name="no_content">没有内容</string>
+
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
     <string name="abbreviated_in_years">%d 年内</string>
     <string name="abbreviated_in_days">%d 天内</string>
@@ -231,18 +308,48 @@
     <string name="abbreviated_hours_ago">%d 小时前</string>
     <string name="abbreviated_minutes_ago">%d 分钟前</string>
     <string name="abbreviated_seconds_ago">%d 秒前</string>
+
+    <!--These are for timestamps on polls -->
+    <string name="timespan_days">%d 天</string>
+    <string name="timespan_hours">%d 小时</string>
+    <string name="timespan_minutes">%d 分钟</string>
+    <string name="timespan_seconds">%d 秒</string>
+
     <string name="follows_you">关注了你</string>
     <string name="pref_title_alway_show_sensitive_media">总是显示所有敏感媒体内容</string>
     <string name="title_media">媒体</string>
     <string name="replying_to">回复 @%s</string>
     <string name="load_more_placeholder_text">加载更多</string>
+
+    <string name="pref_title_public_filter_keywords">公共时间轴</string>
+    <string name="pref_title_thread_filter_keywords">对话</string>
+    <string name="filter_addition_dialog_title">添加新的过滤器</string>
+    <string name="filter_edit_dialog_title">编辑过滤器</string>
+    <string name="filter_dialog_remove_button">移除</string>
+    <string name="filter_dialog_update_button">更新</string>
+    <string name="filter_add_description">需要过滤的文字</string>
+
     <string name="add_account_name">添加帐号</string>
     <string name="add_account_description">添加新的 Mastodon 帐号</string>
+
     <string name="action_lists">列表</string>
     <string name="title_lists">列表</string>
-    <string name="title_list_timeline">列表公共时间线</string>
-    <string name="compose_active_account_description">使用帐号 %1$s 发布嘟文</string>
-    <string name="error_failed_set_caption">设置图片标题失败。</string>
+    <string name="title_list_timeline">列表公共时间轴</string>
+    <string name="error_create_list">无法新建列表</string>
+    <string name="error_rename_list">无法重命名列表</string>
+    <string name="error_delete_list">无法删除列表</string>
+    <string name="action_create_list">新建列表</string>
+    <string name="action_rename_list">重命名列表</string>
+    <string name="action_delete_list">删除列表</string>
+    <string name="action_edit_list">编辑列表</string>
+    <string name="hint_search_people_list">搜索已关注的用户</string>
+    <string name="action_add_to_list">添加用户到列表</string>
+    <string name="action_remove_from_list">从列表中移除用户</string>
+
+    <string name="compose_active_account_description">以 %1$s 发布嘟文</string>
+
+    <string name="error_failed_set_caption">设置图片标题失败</string>
+    <string name="hint_describe_for_visually_impaired">为视觉障碍用户提供的描述\n(限制 %d 字)</string>
     <string name="action_set_caption">设置图片标题</string>
     <string name="action_remove_media">移除</string>
     <string name="lock_account_label">保护你的帐户（锁嘟）</string>
@@ -252,34 +359,136 @@
     <string name="send_toot_notification_error_title">发送失败</string>
     <string name="send_toot_notification_channel_name">嘟文发送中</string>
     <string name="send_toot_notification_cancel_title">发送已被取消</string>
-    <string name="send_toot_notification_saved_content">嘟文已保存到草稿</string>
+    <string name="send_toot_notification_saved_content">嘟文已保存为草稿</string>
     <string name="action_compose_shortcut">发表嘟文</string>
+
+    <string name="error_no_custom_emojis">当前实例 %s 没有自定义表情符号</string>
     <string name="copy_to_clipboard_success">已复制到剪贴板</string>
-    <string name="emoji_style">Emoji 表情</string>
+    <string name="emoji_style">表情符号风格</string>
     <string name="system_default">系统默认</string>
-    <string name="download_fonts">需要下载 Emoji 数据</string>
-    <string name="performing_lookup_title">正在查找…</string>
+    <string name="download_fonts">需要下载表情符号数据</string>
+    <string name="performing_lookup_title">正在查询…</string>
     <string name="expand_collapse_all_statuses">展开/折叠所有嘟文</string>
     <string name="action_open_toot">打开嘟文</string>
     <string name="restart_required">需要重启应用</string>
     <string name="restart_emoji">你需要重启 Tusky 才能生效</string>
-    <string name="later">以后</string>
+    <string name="later">稍后</string>
     <string name="restart">立即重启</string>
-    <string name="caption_systememoji">系统默认 Emoji 表情</string>
-    <string name="caption_blobmoji">Android 4.4–7.1 的黄馒头 Emoji 表情</string>
-    <string name="caption_twemoji">Mastodon 使用的 Emoji 表情</string>
+    <string name="caption_systememoji">系统内置的表情符号</string>
+    <string name="caption_blobmoji">Android 4.4–7.1 的黄馒头表情符号</string>
+    <string name="caption_twemoji">Mastodon 使用的表情符号</string>
+    <!-- string name="emoji_shortcode_format" translatable="false">:%s:</string -->
+
     <string name="download_failed">下载失败</string>
+
+    <string name="profile_badge_bot_text">机器人</string>
     <string name="account_moved_description">%1$s 已迁移到：</string>
+
     <string name="reblog_private">转嘟（可见者不变）</string>
     <string name="unreblog_private">取消转嘟</string>
+
     <string name="license_description">Tusky 使用了以下开源项目的源码：</string>
-    <string name="license_apache_2">以 Apache License 授权（复制如下）</string>
+    <string name="license_apache_2">以 Apache License 授权（详见下方）</string>
+    <string name="license_cc_by_4">CC-BY 4.0</string>
+    <string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
+
     <string name="profile_metadata_label">个人资料附加信息</string>
     <string name="profile_metadata_add">添加信息</string>
     <string name="profile_metadata_label_label">标签</string>
     <string name="profile_metadata_content_label">内容</string>
+
     <string name="pref_title_absolute_time">嘟文显示精确时间</string>
-    <string name="label_remote_account">以下信息可能并不完整，要查看完整资料请使用浏览器打开。</string>
+
+    <string name="label_remote_account">以下信息可能并不完整，要查看完整资料请使用浏览器打开</string>
+
     <string name="unpin_action">取消置顶</string>
     <string name="pin_action">置顶</string>
+
+    <plurals name="favs">
+        <item quantity="one">&lt;b>%1$s&lt;/b> 次收藏</item>
+        <item quantity="other">&lt;b&gt;%1$s&lt;/b&gt; 次收藏</item>
+    </plurals>
+
+    <plurals name="reblogs">
+        <item quantity="one">&lt;b>%s&lt;/b> 次转嘟</item>
+        <item quantity="other">&lt;b&gt;%s&lt;/b&gt; 次转嘟</item>
+    </plurals>
+
+    <string name="title_reblogged_by">转嘟者</string>
+    <string name="title_favourited_by">收藏者</string>
+
+    <string name="conversation_1_recipients">%1$s</string>
+    <string name="conversation_2_recipients">%1$s 和 %2$s</string>
+    <string name="conversation_more_recipients">%1$s, %2$s 和 %3$d 等人</string>
+    <string name="max_tab_number_reached">标签页不能超过 %1$d 个</string>
+
+
+    <string name="description_status_media">
+        媒体: %s
+    </string>
+    <string name="description_status_cw">
+        内容提醒: %s
+    </string>
+    <string name="description_status_media_no_description_placeholder">
+        没有媒体描述信息
+    </string>
+    <string name="description_status_reblogged">
+        被转嘟
+    </string>
+    <string name="description_status_favourited">
+        被收藏
+    </string>
+    <string name="description_visiblity_public">
+        公开
+    </string>
+    <string name="description_visiblity_unlisted">
+        不公开
+    </string>
+    <string name="description_visiblity_private">
+        仅关注者
+    </string>
+    <string name="description_visiblity_direct">
+        私信
+    </string>
+    <string name="description_status">
+        <!-- Display name, cw?, content?, relative date, reposted by?, reposted?, favorited?, username, media?; visibility, fav number?, reblog number?-->
+        %1$s; %2$s; %3$s, %4$s, %5$s; %6$s, %7$s, %8$s, %9$s; %10$s, %11$s, %12$s
+    </string>
+
+    <string name="hint_list_name">列表名</string>
+
+    <string name="edit_hashtag_title">编辑话题</string>
+    <string name="edit_hashtag_hint">不带 # 的话题名字</string>
+    <string name="hashtag">话题</string>
+    <string name="notifications_clear">清除</string>
+    <string name="notifications_apply_filter">过滤</string>
+    <string name="filter_favorites">@string/notification_channel_favourite_name</string>
+    <string name="filter_boosts">@string/notification_channel_boost_name</string>
+    <string name="filter_follows">@string/notification_channel_follow_name</string>
+    <string name="filter_mentions">@string/notification_channel_mention_name</string>
+    <string name="filter_apply">应用</string>
+
+    <string name="compose_shortcut_long_label">发表新嘟文</string>
+    <string name="compose_shortcut_short_label">新嘟文</string>
+    <string name="pref_title_bot_overlay">显示机器人标志</string>
+
+    <string name="notification_clear_text">你确定要永久清空通知列表吗？</string>
+
+    <string name="poll_info_format">
+        <!-- 15 votes • 1 hour left -->
+        %1$s • %2$s</string>
+    <plurals name="poll_info_votes">
+        <item quantity="one">%s 次投票</item>
+        <item quantity="other">%s 次投票</item>
+    </plurals>
+    <string name="poll_info_time_relative">剩余 %s</string>
+    <string name="poll_info_time_absolute">%s 结束</string>
+    <string name="poll_info_closed">已结束</string>
+    <string name="poll_option_format">
+        <!-- 15% vote for this! -->
+        &lt;b>%1$d%%&lt;/b> %2$s</string>
+
+    <string name="poll_vote">投票</string>
+
+
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 27b9019e..4580bbb5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="error_generic">應用程式出現異常</string>
+    <string name="error_network">網絡請求出錯，請檢查互聯網連接並重試</string>
     <string name="error_empty">內容不能為空</string>
     <string name="error_invalid_domain">該域名無效</string>
     <string name="error_failed_app_registration">無法連接此伺服器</string>
@@ -20,14 +21,19 @@
     <string name="error_report_too_few_statuses">至少要檢舉 1 則嘟文</string>
     <string name="error_invalid_regex">正規表示式無效</string>
     <string name="error_sender_account_gone">嘟文發送時出錯</string>
+
     <string name="title_home">主頁</string>
     <string name="title_advanced">進階</string>
     <string name="title_notifications">通知</string>
     <string name="title_public_local">本站時間軸</string>
     <string name="title_public_federated">跨站公開時間軸</string>
+    <string name="title_direct_messages">私信</string>
+    <string name="title_tab_preferences">標籤頁</string>
     <string name="title_view_thread">嘟文</string>
+    <string name="title_tag">#%s</string>
     <string name="title_statuses">嘟文</string>
     <string name="title_statuses_with_replies">嘟文和回覆</string>
+    <string name="title_statuses_pinned">已置顶</string>
     <string name="title_follows">正在關注</string>
     <string name="title_followers">關注者</string>
     <string name="title_favourites">我的收藏</string>
@@ -37,6 +43,8 @@
     <string name="title_edit_profile">編輯個人資料</string>
     <string name="title_saved_toot">草稿</string>
     <string name="title_licenses">開源授權</string>
+
+    <string name="status_username_format">\@%s</string>
     <string name="status_boosted_format">%s 轉嘟了</string>
     <string name="status_sensitive_media_title">敏感內容</string>
     <string name="status_media_hidden_title">已隱藏的照片或影片</string>
@@ -45,16 +53,23 @@
     <string name="status_content_warning_show_less">摺疊內容</string>
     <string name="status_content_show_more">展開</string>
     <string name="status_content_show_less">摺疊</string>
+
+    <string name="message_empty">沒有內容</string>
     <string name="footer_empty">還沒有內容，向下拉動即可重新整理</string>
+
     <string name="notification_reblog_format">%s 轉嘟了你的嘟文</string>
     <string name="notification_favourite_format">%s 收藏了你的嘟文</string>
     <string name="notification_follow_format">%s 關注了你</string>
+
     <string name="report_username_format">檢舉使用者 @%s 的濫用行為</string>
     <string name="report_comment_hint">更多評論？</string>
+
     <string name="action_quick_reply">快速回覆</string>
     <string name="action_reply">回覆</string>
     <string name="action_reblog">轉嘟</string>
+    <string name="action_unreblog">取消轉嘟</string>
     <string name="action_favourite">收藏</string>
+    <string name="action_unfavourite">取消收藏</string>
     <string name="action_more">更多</string>
     <string name="action_compose">發表新嘟文</string>
     <string name="action_login">登入 Mastodon 帳號</string>
@@ -68,6 +83,7 @@
     <string name="action_show_reblogs">顯示轉嘟</string>
     <string name="action_report">檢舉</string>
     <string name="action_delete">刪除</string>
+    <string name="action_delete_and_redraft">刪除並重新編輯</string>
     <string name="action_send">發嘟</string>
     <string name="action_send_public">發嘟！</string>
     <string name="action_retry">重試</string>
@@ -100,39 +116,77 @@
     <string name="action_toggle_visibility">設定嘟文可見範圍</string>
     <string name="action_content_warning">設定敏感內容警告</string>
     <string name="action_emoji_keyboard">插入表情符號</string>
+    <string name="action_add_tab">新增標籤頁</string>
+    <string name="action_links">連結</string>
+    <string name="action_mentions">提及</string>
+    <string name="action_hashtags">話題</string>
+    <string name="action_open_reblogger">打開轉嘟者主頁</string>
+    <string name="action_open_reblogged_by">顯示轉嘟者</string>
+    <string name="action_open_faved_by">顯示收藏者</string>
+
+    <string name="title_hashtags_dialog">話題</string>
+    <string name="title_mentions_dialog">提及</string>
+    <string name="title_links_dialog">連結</string>
+    <string name="action_open_media_n">打開媒體 #%d</string>
+
     <string name="download_image">正在下載 %1$s…</string>
+
     <string name="action_copy_link">複製連結</string>
+    <string name="action_open_as">打開為 %s</string>
+    <string name="action_share_as">分享為 …</string>
+    <string name="download_media">下載媒體</string>
+    <string name="downloading_media">正在下載媒體</string>
+
     <string name="send_status_link_to">分享連結到…</string>
     <string name="send_status_content_to">分享嘟文到…</string>
     <string name="send_media_to">分享媒體到…</string>
+
     <string name="confirmation_reported">已檢舉！</string>
     <string name="confirmation_unblocked">已解除封鎖</string>
     <string name="confirmation_unmuted">已解除靜音</string>
+
     <string name="status_sent">已發送！</string>
     <string name="status_sent_long">成功送出回覆</string>
+
     <string name="hint_domain">域名</string>
     <string name="hint_compose">有什麼新鮮事？</string>
     <string name="hint_content_warning">敏感內容警告</string>
     <string name="hint_display_name">暱稱</string>
     <string name="hint_note">簡介</string>
     <string name="hint_search">搜尋…</string>
+
     <string name="search_no_results">沒找到結果</string>
+
     <string name="label_quick_reply">回覆…</string>
     <string name="label_avatar">頭像</string>
     <string name="label_header">標題</string>
+
     <string name="link_whats_an_instance">什麼是站點？</string>
+
     <string name="login_connection">正在連線…</string>
+
     <string name="dialog_whats_an_instance">請輸入你帳號所在的 Mastodon 站點的域名或地址</string>
+
+
+
+
+
+
+
+
     <string name="dialog_title_finishing_media_upload">正在完成上傳…</string>
     <string name="dialog_message_uploading_media">正在上傳…</string>
     <string name="dialog_download_image">下載</string>
     <string name="dialog_message_cancel_follow_request">移除關注請求？</string>
     <string name="dialog_unfollow_warning">停止關注此使用者？</string>
     <string name="dialog_delete_toot_warning">刪除這條嘟文？</string>
+    <string name="dialog_redraft_toot_warning">刪除並重新編輯這條嘟文？</string>
+
     <string name="visibility_public">公開：所有人可見，並會出現在公開時間軸上</string>
     <string name="visibility_unlisted">不公開：所有人可見，但不會出現在公開時間軸上</string>
     <string name="visibility_private">僅關注者：只有經過你確認後關注你的使用者可見</string>
     <string name="visibility_direct">私信：只有被提及的使用者可見</string>
+
     <string name="pref_title_notification_settings">通知</string>
     <string name="pref_title_edit_notification_settings">通知設定</string>
     <string name="pref_title_notifications_enabled">通知</string>
@@ -149,13 +203,18 @@
     <string name="pref_title_appearance_settings">外觀</string>
     <string name="pref_title_app_theme">佈景主題</string>
     <string name="pref_title_timelines">時間軸</string>
+    <string name="pref_title_timeline_filters">過濾器</string>
+
     <string name="app_them_dark">黑夜</string>
     <string name="app_theme_light">白天</string>
-    <string name="app_theme_black">黑色</string>
+    <string name="app_theme_black">暗色</string>
     <string name="app_theme_auto">自動切換</string>
+    <string name="app_theme_system">跟隨系統</string>
+
     <string name="pref_title_browser_settings">瀏覽器</string>
     <string name="pref_title_custom_tabs">使用 Chrome Custom Tabs</string>
     <string name="pref_title_hide_follow_button">瀏覽時自動隱藏發嘟按鈕</string>
+    <string name="pref_title_language">語言</string>
     <string name="pref_title_status_filter">時間軸過濾</string>
     <string name="pref_title_status_tabs">標籤頁</string>
     <string name="pref_title_show_boosts">顯示轉嘟</string>
@@ -166,37 +225,48 @@
     <string name="pref_title_http_proxy_enable">啟用 HTTP 代理伺服器</string>
     <string name="pref_title_http_proxy_server">HTTP 代理伺服器</string>
     <string name="pref_title_http_proxy_port">HTTP 代理伺服器埠</string>
+
     <string name="pref_default_post_privacy">嘟文預設可見範圍</string>
     <string name="pref_default_media_sensitivity">總是將媒體標示為敏感</string>
     <string name="pref_publishing">發佈（與伺服器同步）</string>
     <string name="pref_failed_to_sync">同步設定失敗</string>
+
     <string name="post_privacy_public">公開</string>
     <string name="post_privacy_unlisted">不公開</string>
     <string name="post_privacy_followers_only">僅關注者</string>
+
     <string name="pref_status_text_size">字體大小</string>
+
     <string name="status_text_size_smallest">最小</string>
     <string name="status_text_size_small">小</string>
     <string name="status_text_size_medium">標準</string>
     <string name="status_text_size_large">大</string>
     <string name="status_text_size_largest">最大</string>
+
     <string name="pref_media_display">媒體顯示</string>
+
     <string name="media_hide_sensitive">自動隱藏敏感媒體</string>
     <string name="media_hide_none">總是顯示敏感媒體</string>
     <string name="media_hide_all">總是隱藏所有媒體</string>
-    <string name="notification_mention_name">被提及</string>
-    <string name="notification_mention_descriptions">當有使用者在嘟文中提及我時</string>
-    <string name="notification_follow_name">關注者</string>
-    <string name="notification_follow_description">當有使用者關注我時</string>
-    <string name="notification_boost_name">轉嘟</string>
-    <string name="notification_boost_description">當有使用者轉嘟了我的嘟文時</string>
-    <string name="notification_favourite_name">收藏</string>
-    <string name="notification_favourite_description">當有使用者收藏了我的嘟文時</string>
+
+    <string name="notification_channel_mention_name">被提及</string>
+    <string name="notification_channel_mention_descriptions">當有使用者在嘟文中提及我時</string>
+    <string name="notification_channel_follow_name">關注者</string>
+    <string name="notification_channel_follow_description">當有使用者關注我時</string>
+    <string name="notification_channel_boost_name">轉嘟</string>
+    <string name="notification_channel_boost_description">當有使用者轉嘟了我的嘟文時</string>
+    <string name="notification_channel_favourite_name">收藏</string>
+    <string name="notification_channel_favourite_description">當有使用者收藏了我的嘟文時</string>
+
+
     <string name="notification_mention_format">%s 提及了你</string>
     <string name="notification_summary_large">%1$s, %2$s, %3$s 和 %4$d 人</string>
     <string name="notification_summary_medium">%1$s, %2$s, 和 %3$s</string>
     <string name="notification_summary_small">%1$s 和 %2$s</string>
     <string name="notification_title_summary">%d 個新互動</string>
+
     <string name="description_account_locked">被鎖定的帳號</string>
+
     <string name="about_title_activity">關於 Tusky</string>
     <string name="about_tusky_license">Tusky 是基於 GNU General Public License Version 3 許可證開源的自由軟體完整的許可證協議：https://www.gnu.org/licenses/gpl-3.0.en.html</string>
     <!-- note to translators:
@@ -205,19 +275,28 @@
            to show we do not mean the software is gratis. Source: https://www.gnu.org/philosophy/free-sw.html
          * the url can be changed to link to the localized version of the license.
     -->
-    <string name="about_project_site">        專案網站：\n
+
+
+
+    <string name="about_project_site">
+        專案網站：\n
         https://tusky.app
     </string>
-    <string name="about_bug_feature_request_site">        問題回報：\n
+    <string name="about_bug_feature_request_site">
+        問題回報：\n
         https://github.com/tuskyapp/Tusky/issues
     </string>
     <string name="about_tusky_account">Tusky 官方帳號</string>
+
     <string name="status_share_content">分享嘟文內容</string>
     <string name="status_share_link">分享嘟文連結</string>
     <string name="status_media_images">照片</string>
     <string name="status_media_video">影片</string>
+
     <string name="state_follow_requested">已請求關注</string>
+
     <string name="no_content">沒有內容</string>
+
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
     <string name="abbreviated_in_years">%d 年內</string>
     <string name="abbreviated_in_days">%d 天內</string>
@@ -229,18 +308,48 @@
     <string name="abbreviated_hours_ago">%d 小時前</string>
     <string name="abbreviated_minutes_ago">%d 分鐘前</string>
     <string name="abbreviated_seconds_ago">%d 秒前</string>
+
+    <!--These are for timestamps on polls -->
+    <string name="timespan_days">%d 天</string>
+    <string name="timespan_hours">%d 小時</string>
+    <string name="timespan_minutes">%d 分鐘</string>
+    <string name="timespan_seconds">%d 秒</string>
+
     <string name="follows_you">關注了你</string>
     <string name="pref_title_alway_show_sensitive_media">總是顯示所有敏感媒體內容</string>
     <string name="title_media">媒體</string>
     <string name="replying_to">回覆 @%s</string>
     <string name="load_more_placeholder_text">載入更多</string>
+
+    <string name="pref_title_public_filter_keywords">公共時間軸</string>
+    <string name="pref_title_thread_filter_keywords">對話</string>
+    <string name="filter_addition_dialog_title">添加新的過濾器</string>
+    <string name="filter_edit_dialog_title">編輯過濾器</string>
+    <string name="filter_dialog_remove_button">移除</string>
+    <string name="filter_dialog_update_button">更新</string>
+    <string name="filter_add_description">需要過濾的文字</string>
+
     <string name="add_account_name">加入帳號</string>
     <string name="add_account_description">加入新的 Mastodon 帳號</string>
+
     <string name="action_lists">列表</string>
     <string name="title_lists">列表</string>
     <string name="title_list_timeline">列表公共時間軸</string>
+    <string name="error_create_list">無法新建列表</string>
+    <string name="error_rename_list">無法重命名列表</string>
+    <string name="error_delete_list">無法刪除列表</string>
+    <string name="action_create_list">新建列表</string>
+    <string name="action_rename_list">重命名列表</string>
+    <string name="action_delete_list">刪除列表</string>
+    <string name="action_edit_list">編輯列表</string>
+    <string name="hint_search_people_list">搜索已關注的用戶</string>
+    <string name="action_add_to_list">添加用戶到列表</string>
+    <string name="action_remove_from_list">從列表中移除用戶</string>
+
     <string name="compose_active_account_description">以 %1$s 發嘟文</string>
+
     <string name="error_failed_set_caption">設定圖片標題失敗</string>
+    <string name="hint_describe_for_visually_impaired">為視覺障礙用戶提供的描述\n(限制 %d 字)</string>
     <string name="action_set_caption">設定圖片標題</string>
     <string name="action_remove_media">移除</string>
     <string name="lock_account_label">保護你的帳戶（鎖嘟）</string>
@@ -252,6 +361,8 @@
     <string name="send_toot_notification_cancel_title">發送已被取消</string>
     <string name="send_toot_notification_saved_content">嘟文已儲存為草稿</string>
     <string name="action_compose_shortcut">撰寫嘟文</string>
+
+    <string name="error_no_custom_emojis">當前站點 %s 沒有自訂表情符號</string>
     <string name="copy_to_clipboard_success">已複製到剪貼簿</string>
     <string name="emoji_style">表情符號風格</string>
     <string name="system_default">系統預設</string>
@@ -266,19 +377,118 @@
     <string name="caption_systememoji">系統預設的表情符號包</string>
     <string name="caption_blobmoji">Android 4.4–7.1 的黃饅頭表情符號</string>
     <string name="caption_twemoji">Mastodon 使用的表情符號</string>
+    <!-- string name="emoji_shortcode_format" translatable="false">:%s:</string -->
+
     <string name="download_failed">下載失敗</string>
+
     <string name="profile_badge_bot_text">機器人</string>
     <string name="account_moved_description">%1$s 已遷移到：</string>
+
     <string name="reblog_private">轉嘟（可見者不變）</string>
     <string name="unreblog_private">取消轉嘟</string>
+
     <string name="license_description">Tusky 使用了以下開源專案的原始碼：</string>
     <string name="license_apache_2">以 Apache License 授權（詳見下方）</string>
+    <string name="license_cc_by_4">CC-BY 4.0</string>
+    <string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
+
     <string name="profile_metadata_label">個人資料附加資訊</string>
     <string name="profile_metadata_add">新增資訊</string>
     <string name="profile_metadata_label_label">標籤</string>
     <string name="profile_metadata_content_label">內容</string>
+
     <string name="pref_title_absolute_time">嘟文顯示精確時間</string>
+
     <string name="label_remote_account">以下資訊可能並不完整，要檢視完整資料請使用瀏覽器開啟</string>
+
     <string name="unpin_action">取消置頂</string>
     <string name="pin_action">置頂</string>
+
+    <plurals name="favs">
+        <item quantity="one">&lt;b>%1$s&lt;/b> 次收藏</item>
+        <item quantity="other">&lt;b>%1$s&lt;/b> 次收藏</item>
+    </plurals>
+
+    <plurals name="reblogs">
+        <item quantity="one">&lt;b>%s&lt;/b> 次轉嘟</item>
+        <item quantity="other">&lt;b>%s&lt;/b> 次轉嘟</item>
+    </plurals>
+
+    <string name="title_reblogged_by">轉嘟者</string>
+    <string name="title_favourited_by">收藏者</string>
+
+    <string name="conversation_1_recipients">%1$s</string>
+    <string name="conversation_2_recipients">%1$s 和 %2$s</string>
+    <string name="conversation_more_recipients">%1$s, %2$s 和 %3$d 等人</string>
+    <string name="max_tab_number_reached">標籤頁不能超過 %1$d 個</string>
+    
+    
+    <string name="description_status_media">
+        媒體: %s
+    </string>
+    <string name="description_status_cw">
+        內容提醒: %s
+    </string>
+    <string name="description_status_media_no_description_placeholder">
+        沒有媒體描述信息
+    </string>
+    <string name="description_status_reblogged">
+        被轉嘟
+    </string>
+    <string name="description_status_favourited">
+        被收藏
+    </string>
+    <string name="description_visiblity_public">
+        公開
+    </string>
+    <string name="description_visiblity_unlisted">
+        不公開
+    </string>
+    <string name="description_visiblity_private">
+        僅關注者
+    </string>
+    <string name="description_visiblity_direct">
+        私信
+    </string>
+    <string name="description_status">
+        <!-- Display name, cw?, content?, relative date, reposted by?, reposted?, favorited?, username, media?; visibility, fav number?, reblog number?-->
+        %1$s; %2$s; %3$s, %4$s, %5$s; %6$s, %7$s, %8$s, %9$s; %10$s, %11$s, %12$s
+    </string>
+    
+    <string name="hint_list_name">列表名</string>
+    
+    <string name="edit_hashtag_title">編輯話題</string>
+    <string name="edit_hashtag_hint">不帶 # 的話題名字</string>
+    <string name="hashtag">話題</string>
+    <string name="notifications_clear">清除</string>
+    <string name="notifications_apply_filter">過濾</string>
+    <string name="filter_favorites">@string/notification_channel_favourite_name</string>
+    <string name="filter_boosts">@string/notification_channel_boost_name</string>
+    <string name="filter_follows">@string/notification_channel_follow_name</string>
+    <string name="filter_mentions">@string/notification_channel_mention_name</string>
+    <string name="filter_apply">應用</string>
+    
+    <string name="compose_shortcut_long_label">發表新嘟文</string>
+    <string name="compose_shortcut_short_label">新嘟文</string>
+    <string name="pref_title_bot_overlay">顯示機器人標誌</string>
+    
+    <string name="notification_clear_text">你確定要永久清空通知列表嗎？</string>
+    
+    <string name="poll_info_format">
+        <!-- 15 votes • 1 hour left -->
+        %1$s • %2$s</string>
+    <plurals name="poll_info_votes">
+        <item quantity="one">%s 次投票</item>
+        <item quantity="other">%s 次投票</item>
+    </plurals>
+    <string name="poll_info_time_relative">剩餘 %s</string>
+    <string name="poll_info_time_absolute">%s 結束</string>
+    <string name="poll_info_closed">已結束</string>
+    <string name="poll_option_format">
+        <!-- 15% vote for this! -->
+        &lt;b>%1$d%%&lt;/b> %2$s</string>
+    
+    <string name="poll_vote">投票</string>
+
+
 </resources>