Merge remote-tracking branch 'origin/develop' into develop

4 files changed, 710 insertions, 292 deletions

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index c0cc20824..dd4ed1a1c 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -997,4 +997,6 @@
     <string name="proxy_protocol_http">HTTP</string>
     <string name="about_peertube">„PeerTube je nástroj pro sdílení videa vyvinutý francouzskou neziskovou organizací Framasoft.…PeerTube umožňuje, aby byly platformy vzájemně propojeny a vytvořily tak velkou síť platforem, které jsou zároveň autonomní i propojené.“</string>
     <string name="following">Sledující</string>
+    <string name="toast_error_peertube_not_supported">Vaše instance Peertube je příliš stará a nemůže být aplikací podporována.</string>
+    <string name="compose_shortcut_short_label1">Vytváření</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index f4bcf307c..fa73b9d35 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -981,4 +981,6 @@
     <string name="proxy_protocol">Protocolo</string>
     <string name="proxy_protocol_socks">SOCKS</string>
     <string name="about_peertube">\"PeerTube é unha ferramenta desenvolta por Framasoft (organización sen ánimo de lucro) para compartir vídeos en internet. PeerTube permite que unhas plataformas se conecten con outras, creando unha gran rede na que as partes son autónomas e están interconectadas.\"</string>
+    <string name="compose_shortcut_short_label1">Redactar</string>
+    <string name="toast_error_peertube_not_supported">O teu Peertube é demasiado antigo e non pode usarse coa app.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 59a92034d..8c17d80aa 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -421,7 +421,7 @@
     <string name="saving">Salvando…</string>
     <string name="image_saved">Imagem salva!</string>
     <string name="save_image_failed">Falha ao salvar imagem</string>
-    <string name="add_poll_item">Adicionar um item</string>
+    <string name="add_poll_item">Adicionar uma opção</string>
     <string name="mute_conversation">Silenciar conversação</string>
     <string name="unmute_conversation">Remover silenciar da conversação</string>
     <string name="toast_unmute_conversation">A conversação não está mais silenciada!</string>
@@ -905,4 +905,5 @@
     <string name="proxy_protocol_http">HTTP</string>
     <string name="set_maths_support">Escrever fórmula</string>
     <string name="show_privates">Mostrar mensagens diretas</string>
+    <string name="about_peertube">\"PeerTube é uma ferramenta para compartilhar vídeos online desenvolvida pela Framasoft, uma organização francesa sem fins lucrativos.…PeerTube permite que as plataformas sejam conectadas umas às outras, criando uma grande rede de plataformas autônomas e interconectadas.\"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index c29e962a9..f559f8949 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_about">关于</string>
-    <string name="action_about_instance">关于此实例</string>
+    <string name="action_about_instance">关于实例</string>
     <string name="action_privacy">隐私</string>
     <string name="action_cache">缓存</string>
     <string name="action_logout">登出</string>
@@ -15,68 +15,68 @@
     <string name="save_over">媒体已保存</string>
     <string name="download_from" formatted="false">文件：%1$s</string>
     <string name="password">密码</string>
-    <string name="email">电子邮箱</string>
-    <string name="accounts">帐户</string>
-    <string name="toots">嘟文</string>
+    <string name="email">电子邮件</string>
+    <string name="accounts">帐号</string>
+    <string name="toots">消息</string>
     <string name="tags">标签</string>
     <string name="save">保存</string>
     <string name="instance">实例</string>
     <string name="instance_example">实例：mastodon.social</string>
-    <string name="toast_account_changed" formatted="false">现在使用 %1$s 这个帐户</string>
-    <string name="add_account">添加帐户</string>
-    <string name="clipboard">已复制嘟文的内容到剪贴板</string>
-    <string name="clipboard_url">已复制嘟文链接至剪贴板</string>
+    <string name="toast_account_changed" formatted="false">现在使用帐号 %1$s</string>
+    <string name="add_account">添加帐号</string>
+    <string name="clipboard">消息内容已复制到剪贴板</string>
+    <string name="clipboard_url">消息的 URL 已复制到剪贴板</string>
     <string name="camera">相机</string>
-    <string name="delete_all">全部删除</string>
+    <string name="delete_all">删除所有</string>
     <string name="schedule">定时</string>
-    <string name="text_size">文本大小</string>
-    <string name="next">下一个</string>
-    <string name="previous">上一个</string>
-    <string name="open_with">打开方式</string>
-    <string name="validate">确认</string>
+    <string name="text_size">文字大小</string>
+    <string name="next">继续</string>
+    <string name="previous">返回</string>
+    <string name="open_with">打开用</string>
+    <string name="validate">激活</string>
     <string name="media">媒体</string>
-    <string name="share_with">分享给</string>
-    <string name="shared_via">通过 Fedilab 分享</string>
+    <string name="share_with">分享</string>
+    <string name="shared_via">通过 Fedilab 共享</string>
     <string name="replies">回复</string>
     <string name="username">用户名</string>
     <string name="drafts">草稿</string>
     <string name="favourite">收藏夹</string>
-    <string name="follow">新关注者</string>
+    <string name="follow">新的关注者</string>
     <string name="mention">提及</string>
-    <string name="reblog">转嘟</string>
-    <string name="show_boosts">显示转嘟</string>
+    <string name="reblog">转发</string>
+    <string name="show_boosts">显示转发</string>
     <string name="show_replies">显示回复</string>
     <string name="action_open_in_web">在浏览器中打开</string>
     <string name="translate">翻译</string>
     <!--- Menu -->
     <string name="home_menu">主页</string>
     <string name="local_menu">本地时间线</string>
-    <string name="muted_menu">已静音用户</string>
+    <string name="muted_menu">静音用户</string>
     <string name="blocked_menu">已屏蔽用户</string>
     <string name="notifications">通知</string>
     <string name="follow_request">关注请求</string>
     <string name="settings">设置</string>
     <string name="send_email">发送电子邮件</string>
-    <string name="scheduled_toots">定时嘟文</string>
-    <string name="disclaimer_full">以下信息可能不够完整反映该用户的资料。</string>
+    <string name="scheduled_toots">定时消息</string>
+    <string name="disclaimer_full">以下信息可能无法完整反映用户的个人资料。</string>
     <string name="insert_emoji">插入表情符号</string>
-    <string name="no_emoji">该应用程序当前没有收集自定义表情。</string>
-    <string name="logout_account_confirmation">确定要退出登录吗%1$s@%2$s？</string>
+    <string name="no_emoji">该应用程序暂时不收集自定义表情符号。</string>
+    <string name="logout_account_confirmation">您确定要注销@%1$s@%2$s 吗？</string>
     <!-- Status -->
-    <string name="no_status">没有嘟文可以显示</string>
-    <string name="favourite_add">添加此嘟文到您的收藏夹中？</string>
-    <string name="favourite_remove">从您的收藏夹中移除此嘟文？</string>
-    <string name="reblog_add">转发这条嘟文吗？</string>
-    <string name="reblog_remove">取消转发这条嘟文吗？</string>
+    <string name="no_status">没有要显示的消息</string>
+    <string name="favourite_add">将此消息添加到您的收藏夹？</string>
+    <string name="favourite_remove">从收藏夹中删除此消息？</string>
+    <string name="reblog_add">转发这条消息？</string>
+    <string name="reblog_remove">取消转发此消息？</string>
     <string name="more_action_1">静音</string>
     <string name="more_action_2">屏蔽</string>
     <string name="more_action_3">举报</string>
-    <string name="more_action_4">移除</string>
+    <string name="more_action_4">删除</string>
     <string name="more_action_5">复制</string>
     <string name="more_action_6">分享</string>
-    <string name="more_action_7">提及</string>
+    <string name="more_action_7">提到</string>
     <string name="more_action_8">定时静音</string>
-    <string name="more_action_9">删除并加入草稿</string>
+    <string name="more_action_9">删除并重新起草</string>
     <string-array name="more_action_confirm">
         <item>是否禁音此帐户？</item>
         <item>是否屏蔽此帐户？</item>
@@ -94,15 +94,15 @@
         <item>删除并重新添加这条嘟文到草稿里？</item>
     </string-array>
     <string name="bookmarks">书签</string>
-    <string name="bookmark_add">加入书签</string>
-    <string name="bookmark_remove">移除书签</string>
+    <string name="bookmark_add">添加到书签</string>
+    <string name="bookmark_remove">删除书签</string>
     <string name="status_bookmarked">状态已添加到书签！</string>
-    <string name="status_unbookmarked">状态已从书签移除！</string>
+    <string name="status_unbookmarked">状态已从书签中删除！</string>
     <!-- Date -->
-    <string name="date_seconds">%d 秒</string>
-    <string name="date_minutes">%d 分</string>
-    <string name="date_hours">%d 小时</string>
-    <string name="date_day">%d 天</string>
+    <string name="date_seconds">%d s</string>
+    <string name="date_minutes">%d m</string>
+    <string name="date_hours">%d h</string>
+    <string name="date_day">%d d</string>
     <plurals name="date_seconds_polls">
         <item quantity="other">%d 秒</item>
     </plurals>
@@ -116,99 +116,103 @@
         <item quantity="other">%d 天</item>
     </plurals>
     <!-- TOOT -->
-    <string name="toot_select_image_error">选择媒体时出现了错误！</string>
-    <string name="toot_delete_media">删除此媒体吗？</string>
-    <string name="toot_error_no_content">您的嘟文是空的！</string>
-    <string name="toot_sent">嘟文已发送！</string>
+    <string name="toot_select_image_error">选择媒体时出错！</string>
+    <string name="toot_delete_media">删除此媒体？</string>
+    <string name="toot_error_no_content">你的消息是空的！</string>
+    <string name="toot_sent">消息已发送！</string>
     <string name="toot_sensitive">敏感内容？</string>
     <string name="no_draft">没有草稿！</string>
     <string name="choose_accounts">选择一个帐号</string>
     <string name="select_accounts">选择一些帐号</string>
-    <string name="remove_draft">移除草稿？</string>
-    <string name="upload_form_description">给视觉障碍人士的描述</string>
+    <string name="remove_draft">删除草稿？</string>
+    <string name="upload_form_description">为视觉障碍人士添加文字说明</string>
     <!-- Instance -->
     <string name="instance_no_description">没有可用的描述！</string>
     <!-- About -->
-    <string name="about_vesrion">版本 %1$s</string>
-    <string name="about_developer">开发者：</string>
-    <string name="about_license">许可协议： </string>
+    <string name="about_vesrion">发行版 %1$s</string>
+    <string name="about_developer">开发商：</string>
+    <string name="about_license">许可：</string>
     <string name="about_license_action">GNU GPL V3</string>
     <string name="about_code">源代码： </string>
     <string name="about_thekinrar">搜索实例：</string>
     <!-- Conversation -->
     <!-- Accounts -->
-    <string name="no_accounts">没有帐户可以显示</string>
-    <string name="no_follow_request">无关注请求</string>
-    <string name="status_cnt">嘟文
-\n%1$s</string>
-    <string name="following_cnt">关注\n%1$s</string>
-    <string name="followers_cnt">粉丝\n%1$s</string>
+    <string name="no_accounts">没有可显示的帐号</string>
+    <string name="no_follow_request">没有关注请求</string>
+    <string name="status_cnt">消息
+\n %1$s</string>
+    <string name="following_cnt">正在关注
+\n %1$s</string>
+    <string name="followers_cnt">关注者
+\n %1$s</string>
     <string name="reject">拒绝</string>
     <!-- Scheduled toots -->
-    <string name="no_scheduled_toots">没有定时嘟文可以显示！</string>
-    <string name="remove_scheduled">删除该定时嘟文吗？</string>
-    <string name="toot_scheduled">嘟文将在预定时间发送！</string>
-    <string name="toot_scheduled_date">预定的时间必须比现在晚一小时！</string>
+    <string name="no_scheduled_toots">没有要显示的定时消息！</string>
+    <string name="remove_scheduled">删除定时消息？</string>
+    <string name="toot_scheduled">消息已定时！</string>
+    <string name="toot_scheduled_date">定时日期必须大于当前时间！</string>
     <!-- timed mute -->
-    <string name="timed_mute_date_error">静音时间应超过 1 分钟。</string>
-    <string name="timed_mute_date">%1$s 已被静音至 %2$s。\n您可以从他的档案页中取消静音。</string>
-    <string name="timed_mute_profile">%1$s 已被静音至 %2$s。\n点击这里取消该帐号的静音。</string>
+    <string name="timed_mute_date_error">静音时间应大于一分钟。</string>
+    <string name="timed_mute_date">%1$s 在 %2$s 之前一直被静音。
+\n 您可以从他们的个人资料页面取消静音此帐号。</string>
+    <string name="timed_mute_profile">%1$s 在 %2$s 之前一直处于静音状态。
+\n 点击此处取消帐号静音。</string>
     <!-- Notifications -->
-    <string name="no_notifications">没有通知可以显示</string>
-    <string name="notif_mention">提及了您</string>
-    <string name="notif_status">撰写一条新消息</string>
-    <string name="notif_reblog">转嘟了您的状态</string>
-    <string name="notif_favourite">收藏了您的状态</string>
-    <string name="notif_follow">关注了您</string>
+    <string name="no_notifications">没有可显示的通知</string>
+    <string name="notif_mention">提到你</string>
+    <string name="notif_status">写了一条新消息</string>
+    <string name="notif_reblog">转发了你的状态</string>
+    <string name="notif_favourite">喜欢你的状态</string>
+    <string name="notif_follow">关注了你</string>
     <string name="notif_follow_request">请求关注你</string>
-    <string name="delete_notification_ask_all">删除所有通知吗？</string>
-    <string name="delete_notification_all">已删除所有通知！</string>
+    <string name="delete_notification_ask_all">删除所有通知？</string>
+    <string name="delete_notification_all">所有通知已删除！</string>
     <!-- HEADER -->
-    <string name="followers">粉丝</string>
+    <string name="followers">关注者</string>
     <!-- TOAST -->
     <string name="client_error">无法获取客户端 ID！</string>
-    <string name="toast_block">该帐号已被屏蔽！</string>
-    <string name="toast_unblock">该帐号不再被屏蔽！</string>
+    <string name="toast_block">帐号被屏蔽了！</string>
+    <string name="toast_unblock">帐号不再被屏蔽！</string>
     <string name="toast_mute">该帐号已被静音！</string>
     <string name="toast_unmute">该帐号不再被静音！</string>
-    <string name="toast_follow">已关注此帐号！</string>
-    <string name="toast_unfollow">已取消关注此帐号！</string>
-    <string name="toast_reblog">该嘟文已被转发！</string>
-    <string name="toast_unreblog">该嘟文已不再被转发！</string>
-    <string name="toast_favourite">该嘟文已添加到您的收藏夹！</string>
-    <string name="toast_unfavourite">该嘟文已从您的收藏夹中移除！</string>
+    <string name="toast_follow">该帐号被关注了！</string>
+    <string name="toast_unfollow">帐号不再关注！</string>
+    <string name="toast_reblog">消息被转发了！</string>
+    <string name="toast_unreblog">该消息不再被转发！</string>
+    <string name="toast_favourite">该消息已添加到您的收藏夹！</string>
+    <string name="toast_unfavourite">该消息已从您的收藏夹中删除！</string>
     <string name="toast_error">哎呀！发生错误！</string>
     <string name="toast_code_error">发生错误！该实例未返回授权码！</string>
-    <string name="toast_error_instance">该实例域名似乎是无效的！</string>
-    <string name="toast_error_loading_account">在帐户间切换时发生错误！</string>
+    <string name="toast_error_instance">实例域名似乎无效！</string>
+    <string name="toast_error_loading_account">在帐号之间切换时发生错误！</string>
     <string name="toast_error_search">搜索时出错！</string>
-    <string name="nothing_to_do">无法进行任何操作</string>
-    <string name="toast_error_translate">翻译时出错！</string>
+    <string name="nothing_to_do">无操作可执行</string>
+    <string name="toast_error_translate">翻译时发生错误！</string>
     <!-- Settings -->
-    <string name="set_toots_page">每次加载的嘟文数量</string>
+    <string name="set_toots_page">每次加载的消息数</string>
     <string name="set_disable_gif">禁用 GIF 头像</string>
-    <string name="set_notif_follow">当有人关注您时通知</string>
-    <string name="set_notif_follow_share">当某人转嘟您的状态时通知</string>
-    <string name="set_notif_follow_add">当某人收藏您的状态时通知</string>
-    <string name="set_notif_follow_mention">当有人提到您时通知</string>
-    <string name="set_notif_follow_poll">当投票结束发出通知</string>
-    <string name="set_notif_status">通知新帖子</string>
-    <string name="set_share_validation">转嘟前显示确认对话框</string>
-    <string name="set_share_validation_fav">添加到收藏夹前显示确认对话框</string>
-    <string name="set_notify">开启通知？</string>
-    <string name="set_notif_silent">静音通知</string>
+    <string name="set_notif_follow">当有人关注你时通知</string>
+    <string name="set_notif_follow_share">当有人提升您的地位时通知</string>
+    <string name="set_notif_follow_add">当有人收藏您的状态时通知</string>
+    <string name="set_notif_follow_mention">当有人提到你时通知</string>
+    <string name="set_notif_follow_poll">投票结束时通知</string>
+    <string name="set_notif_status">通知新职位</string>
+    <string name="set_share_validation">转发前显示确认对话框</string>
+    <string name="set_share_validation_fav">添加到收藏夹之前显示确认对话框</string>
+    <string name="set_notify">通知？</string>
+    <string name="set_notif_silent">静默通知</string>
     <string name="set_nsfw_timeout">NSFW 查看超时（秒，0 表示关闭）</string>
-    <string name="set_med_desc_timeout">媒体描述超时(秒，0表示关闭)</string>
+    <string name="set_med_desc_timeout">媒体描述超时（秒，0 表示关闭）</string>
     <string name="settings_title_custom_sharing">自定义分享</string>
-    <string name="settings_custom_sharing_url">您的自定义分享链接…</string>
-    <string name="set_lock_account">锁定帐户</string>
-    <string name="set_save_changes">保存修改</string>
-    <string name="set_fit_preview">适应预览图像</string>
-    <string name="settings_time_from">介于</string>
+    <string name="settings_custom_sharing_url">您的自定义分享网址…</string>
+    <string name="set_lock_account">锁定帐号</string>
+    <string name="set_save_changes">保存更改</string>
+    <string name="set_fit_preview">适合预览图像</string>
+    <string name="settings_time_from">之间</string>
     <string name="settings_time_to">和</string>
     <string name="embedded_browser">使用内置浏览器</string>
-    <string name="custom_tabs">自定义标签页</string>
-    <string name="expand_cw">自动展开带有警告的内容</string>
+    <string name="custom_tabs">自定义标签</string>
+    <string name="expand_cw">自动展开cw</string>
     <string name="set_led_colour">设置 LED 颜色：</string>
     <string-array name="led_colours">
         <item>蓝色</item>
@@ -224,8 +228,8 @@
     <string name="action_mute">静音</string>
     <string name="action_unmute">取消静音</string>
     <string name="request_sent">请求已发送</string>
-    <string name="followed_by">关注您</string>
-    <string name="set_capitalize">回复时首字母大写</string>
+    <string name="followed_by">关注了您</string>
+    <string name="set_capitalize">大写首字母表示答复</string>
     <string name="set_resize_picture">调整图片大小</string>
     <string name="set_resize_video">调整视频大小</string>
     <!-- Quick settings for notifications -->
@@ -236,105 +240,105 @@
     <string name="title_hint_custom_sharing">标题…</string>
     <string name="description_header_custom_sharing">描述</string>
     <string name="keywords_header_custom_sharing">关键词</string>
-    <string name="keywords_hint_custom_sharing">关键词…</string>
+    <string name="keywords_hint_custom_sharing">关键字…</string>
     <!-- ACTIVITY CACHE -->
     <string name="v_public">公开</string>
-    <string name="v_unlisted">未列出</string>
+    <string name="v_unlisted">不公开</string>
     <string name="v_private">私密</string>
     <string name="v_direct">私信</string>
     <!-- PRIVACY -->
-    <string name="filter_regex">按正则表达式进行筛选</string>
-    <string name="search">搜素</string>
+    <string name="filter_regex">通过正则表达式过滤</string>
+    <string name="search">搜索</string>
     <string name="delete">删除</string>
     <!-- About lists -->
     <string name="action_lists">列表</string>
-    <string name="action_lists_confirm_delete">您确实要永久删除此列表吗？</string>
-    <string name="action_lists_add_to">添加到列表</string>
+    <string name="action_lists_confirm_delete">您确定要永久删除此列表吗？</string>
+    <string name="action_lists_add_to">添加到列表中</string>
     <string name="action_lists_delete">删除列表</string>
     <string name="action_lists_title_placeholder">新列表标题</string>
-    <string name="action_lists_add_user">帐号已添加到列表!</string>
-    <string name="action_lists_empty">您暂时没有任何列表!</string>
+    <string name="action_lists_add_user">该帐号已添加到列表中！</string>
+    <string name="action_lists_empty">您还没有任何列表！</string>
     <!-- Migration -->
-    <string name="account_moved_to">%1$s 已被移动到 %2$s</string>
-    <string name="media_ready">媒体已加载。单击此处显示。</string>
+    <string name="account_moved_to">%1$s 已移至 %2$s</string>
+    <string name="media_ready">媒体已加载。点击这里显示它。</string>
     <!-- Proxy -->
     <string name="proxy_set">代理</string>
     <string name="proxy_enable">启用代理？</string>
     <string name="poxy_host">主机</string>
     <string name="poxy_port">端口</string>
-    <string name="poxy_login">用户名</string>
+    <string name="poxy_login">登录</string>
     <string name="poxy_password">密码</string>
-    <string name="set_share_details">分享时添加嘟文的详细信息</string>
-    <string name="support_the_app_on_liberapay">在 Liberapay 上支持这个应用</string>
-    <string name="alert_regex">正则表达式中有错误！</string>
-    <string name="toast_instance_unavailable">未在此实例中找到时间线！</string>
+    <string name="set_share_details">分享时添加消息详情</string>
+    <string name="support_the_app_on_liberapay">在 Liberapay 上支持 app</string>
+    <string name="alert_regex">正则表达式有错误！</string>
+    <string name="toast_instance_unavailable">在此实例上未找到时间线！</string>
     <string name="follow_instance">关注实例</string>
-    <string name="toast_instance_already_added">您已关注过该实例！</string>
-    <string name="action_partnership">合作伙伴</string>
-    <string name="hide_boost">隐藏 %s 的转嘟</string>
-    <string name="endorse">推荐在个人页上</string>
-    <string name="show_boost">显示 %s 的转嘟</string>
-    <string name="unendorse">取消推荐在个人页上</string>
+    <string name="toast_instance_already_added">您已经关注了这个实例！</string>
+    <string name="action_partnership">伙伴关系</string>
+    <string name="hide_boost">隐藏来自 %s 的转发</string>
+    <string name="endorse">个人资料上的功能</string>
+    <string name="show_boost">显示来自 %s 的转发</string>
+    <string name="unendorse">不要出现在个人资料中</string>
     <string name="direct_message">私信</string>
-    <string name="filters">筛选器</string>
-    <string name="action_filters_empty_content">没有筛选器可以显示。您可以点击“+”按钮新建一个。</string>
-    <string name="filter_keyword">关键词或短语</string>
-    <string name="context_home">主时间线</string>
-    <string name="context_public">公共时间线</string>
+    <string name="filters">过滤器</string>
+    <string name="action_filters_empty_content">无过滤器可显示。您可以通过点击“+”按钮创建一个。</string>
+    <string name="filter_keyword">关键字或词组</string>
+    <string name="context_home">主页时间轴</string>
+    <string name="context_public">公共时间表</string>
     <string name="context_notification">通知</string>
     <string name="context_conversation">对话</string>
-    <string name="filter_keyword_explanations">匹配将忽略嘟文的文本大小写或内容警告</string>
-    <string name="context_drop">丢弃而不是隐藏</string>
-    <string name="context_drop_explanations">筛选的嘟文将永久消失，即使之后移除筛选器</string>
-    <string name="context_whole_word_explanations">如果关键词或短语只为字母数字时，将只在词语完全匹配时才会应用</string>
-    <string name="context_whole_word">完全匹配词语</string>
-    <string name="filter_context">筛选内容</string>
-    <string name="filter_context_explanations">筛选器将应用到的一个或多个内容</string>
+    <string name="filter_keyword_explanations">无论文本中的大小写或消息的内容警告都会被匹配</string>
+    <string name="context_drop">放下而不是隐藏</string>
+    <string name="context_drop_explanations">过滤后的消息将不可逆转地消失，即使过滤器稍后被删除</string>
+    <string name="context_whole_word_explanations">当关键字或短语仅为字母数字时，只有在匹配整个单词时才会应用</string>
+    <string name="context_whole_word">整个词</string>
+    <string name="filter_context">过滤上下文</string>
+    <string name="filter_context_explanations">应应用过滤器的一个或多个上下文</string>
     <string name="filter_expire">过期于</string>
-    <string name="action_filter_delete">删除筛选器？</string>
-    <string name="action_update_filter">更新筛选器</string>
-    <string name="action_list_add">您还未创建列表。点击“+”按钮新建一个。</string>
+    <string name="action_filter_delete">删除过滤器？</string>
+    <string name="action_update_filter">更新过滤器</string>
+    <string name="action_list_add">您还没有创建列表。点击“+”按钮添加一个新列表。</string>
     <string name="expand_image">自动展开隐藏媒体</string>
-    <string name="channel_notif_follow">新的粉丝</string>
-    <string name="channel_notif_boost">新的转嘟</string>
-    <string name="channel_notif_fav">新的收藏</string>
-    <string name="channel_notif_mention">新的提及</string>
-    <string name="channel_notif_poll">投票已结束</string>
-    <string name="channel_notif_backup">嘟文备份</string>
+    <string name="channel_notif_follow">新关注</string>
+    <string name="channel_notif_boost">新转发</string>
+    <string name="channel_notif_fav">新收藏</string>
+    <string name="channel_notif_mention">新提及</string>
+    <string name="channel_notif_poll">投票结束</string>
+    <string name="channel_notif_backup">消息备份</string>
     <string name="channel_notif_status">新帖子</string>
     <string name="channel_notif_media">媒体下载</string>
-    <string name="select_sound">选择铃声</string>
-    <string name="set_enable_time_slot">启用时间段</string>
+    <string name="select_sound">选择音色</string>
+    <string name="set_enable_time_slot">启用时隙</string>
     <string name="block_domain_confirm_message">您确定要屏蔽 %s 吗？
 \n
-\n您将不会在任何公共时间轴或通知中看到来自该域的任何内容。来自该域的关注者将被删除。</string>
+\n您将不会在任何公共时间线或通知中看到来自该域名的任何内容。您来自该域名的关注者将被移除。</string>
     <string name="block_domain">屏蔽域名</string>
-    <string name="toast_block_domain">该域名已被屏蔽</string>
-    <string name="retrieve_remote_status">正在获取远程状态</string>
+    <string name="toast_block_domain">域名已被屏蔽</string>
+    <string name="retrieve_remote_status">获取远程状态</string>
     <string name="peertube_instance">Peertube 实例</string>
     <string name="set_display_emoji">使用 Emoji One</string>
     <string name="information">信息</string>
-    <string name="set_display_card">显示所有嘟文预览</string>
+    <string name="set_display_card">在所有消息中显示预览</string>
     <string name="account_id_clipbloard">帐号 ID 已复制到剪贴板！</string>
     <string name="set_change_locale">更改语言</string>
-    <string name="truncate_long_toots">截断长嘟文</string>
-    <string name="set_truncate_toot">截断超过“x”行的嘟文。0 代表禁用。</string>
+    <string name="truncate_long_toots">截断长消息</string>
+    <string name="set_truncate_toot">截断“x”行的消息。零表示禁用。</string>
     <string name="display_toot_truncate">显示更多</string>
-    <string name="hide_toot_truncate">收起</string>
-    <string name="tags_already_stored">该标签已经存在！</string>
-    <string name="schedule_boost">定时转嘟</string>
-    <string name="boost_scheduled">转嘟将在预定时间发布！</string>
-    <string name="no_scheduled_boosts">没有预定的转嘟可以显示！</string>
+    <string name="hide_toot_truncate">显示更少</string>
+    <string name="tags_already_stored">标签已经存在！</string>
+    <string name="schedule_boost">定时转发</string>
+    <string name="boost_scheduled">转发已定时！</string>
+    <string name="no_scheduled_boosts">没有定时的转发要显示！</string>
     <string name="open_menu">打开菜单</string>
-    <string name="profile_picture">个人资料图片</string>
+    <string name="profile_picture">个人资料头像</string>
     <string name="profile_banner">个人资料横幅</string>
-    <string name="contact_instance_admin">联系该实例的管理员</string>
-    <string name="mastohost_logo">MastoHost 徽标</string>
+    <string name="contact_instance_admin">联系实例管理员</string>
+    <string name="mastohost_logo">MastoHost 图标</string>
     <string name="emoji_picker">表情符号选择器</string>
     <string name="expand_conversation">展开对话</string>
     <string name="custom_emoji_picker">自定义表情符号选择器</string>
-    <string name="favicon">网站图标</string>
-    <string name="media_description">要添加描述的媒体</string>
+    <string name="favicon">图标</string>
+    <string name="media_description">添加媒体描述（针对视障人士）</string>
     <string-array name="filter_expire">
         <item>从不</item>
         <item>30 分钟</item>
@@ -350,134 +354,138 @@
     <string name="show_media_nsfw">显示 NSFW</string>
     <string name="bot">机器人</string>
     <string name="pixelfed_instance">Pixelfed 实例</string>
-    <string name="mastodon_instance">长毛象实例</string>
-    <string name="any_tags">任一</string>
-    <string name="all_tags">全部</string>
-    <string name="none_tags">除开</string>
-    <string name="some_words_any">任一关键词（以空格隔开）</string>
-    <string name="some_words_all">全部关键词（以空格隔开）</string>
-    <string name="some_tags">新增一些文字到过滤器（以空格分开）</string>
-    <string name="change_tag_column">更改列名称</string>
+    <string name="mastodon_instance">Mastodon 实例</string>
+    <string name="any_tags">任何这些</string>
+    <string name="all_tags">所有这些</string>
+    <string name="none_tags">都不是</string>
+    <string name="some_words_any">这些词中的任何一个（空格分隔）</string>
+    <string name="some_words_all">所有这些词（空格分隔）</string>
+    <string name="some_tags">添加一些词来过滤（空格分隔）</string>
+    <string name="change_tag_column">更改列名</string>
     <string name="misskey_instance">Misskey 实例</string>
-    <string name="trending">趋势</string>
-    <string name="local">本地</string>
+    <string name="trending">热门</string>
+    <string name="local">当地的</string>
     <string name="category">类别</string>
     <string name="description">描述</string>
     <string name="share">分享</string>
-    <string name="toots_server">嘟文（服务器）</string>
-    <string name="toots_client">嘟文（设备）</string>
+    <string name="toots_server">消息（服务器）</string>
+    <string name="toots_client">消息（设备）</string>
     <string name="settings_category_label_timelines">时间线</string>
     <string name="settings_category_label_interface">界面</string>
     <string name="contact">联系人</string>
-    <string name="toot_select_file_error">选择备份文件时发生错误！</string>
+    <string name="toot_select_file_error">选择备份文件时出错！</string>
     <string name="action_logout_account">登出帐号</string>
     <string name="all">全部</string>
     <string name="copy_link">复制链接</string>
-    <string name="calls_blocked">应用程序阻止了 HTTP 通话</string>
-    <string name="list_of_blocked_domains">阻挡通话列表</string>
+    <string name="calls_blocked">应用程序阻止的 http 调用</string>
+    <string name="list_of_blocked_domains">被屏蔽的调用列表</string>
     <string name="submit">提交</string>
-    <string name="filter_timeline_with_a_tag">根据标签过滤时间线</string>
-    <string name="no_tags">无标签</string>
-    <string name="set_retrieve_metadata_share_from_extras">分享 URL 时附加图像</string>
+    <string name="filter_timeline_with_a_tag">使用标签过滤时间线</string>
+    <string name="no_tags">没有标签</string>
+    <string name="set_retrieve_metadata_share_from_extras">分享网址时附上图片</string>
     <!-- end languages -->
     <string name="create_poll">创建投票</string>
     <string name="poll_choice_s">选择 %d</string>
-    <string name="poll_invali