Merge branch 'dev' into messenger

3 files changed, 0 insertions, 4 deletions

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b8f30845..3946369e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -25,7 +25,6 @@
     <string name="account_not_found">当前帐户不在数据库中</string>
     <string name="frost_notifications">Frost通知</string>
     <string name="requires_custom_theme">需要自定义主题</string>
-    <string name="subject">标题</string>
     <string name="share">分享</string>
     <string name="web_overlay_swipe_hint">往右滑回到前一个窗口</string>
     <string name="profile_picture">个人资料照片</string>
diff --git a/app/src/main/res/values-zh-rCN/strings_errors.xml b/app/src/main/res/values-zh-rCN/strings_errors.xml
index 74fe5445..913619c3 100644
--- a/app/src/main/res/values-zh-rCN/strings_errors.xml
+++ b/app/src/main/res/values-zh-rCN/strings_errors.xml
@@ -2,7 +2,6 @@
 <!--Generated by crowdin.com-->
 <resources>
     <string name="null_url_overlay">用于覆盖的地址为空，正在退出</string>
-    <string name="bad_image_overlay">地址无法正确加载。你想发送它以进行调试吗？</string>
     <string name="invalid_share_url">无效的共享地址</string>
     <string name="invalid_share_url_desc">你已共享的文本不是地址。文本已被复制到剪贴板上，以便手动共享。</string>
     <string name="no_download_manager">没有下载管理器</string>
diff --git a/app/src/main/res/values-zh-rCN/strings_web_context.xml b/app/src/main/res/values-zh-rCN/strings_web_context.xml
index 1a8c6198..7054a3be 100644
--- a/app/src/main/res/values-zh-rCN/strings_web_context.xml
+++ b/app/src/main/res/values-zh-rCN/strings_web_context.xml
@@ -2,8 +2,6 @@
 <!--Generated by crowdin.com-->
 <resources>
     <string name="share_link">分享链接</string>
-    <string name="debug_link">调试链接</string>
-    <string name="debug_link_desc">如果链接没有正确加载, 您可以给我发电子邮件, 以便我可以帮助调试它。点击 ok 将打开一个电子邮件请求</string>
     <string name="open_link">打开链接</string>
     <string name="copy_link">复制链接</string>
     <string name="copy_text">复制文字</string>