diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 210bdc6066..2063a0ba17 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -31,8 +31,8 @@
         <item quantity="other">%1$d neue</item>
     </plurals>
     <plurals name="title_moving_messages">
-        <item quantity="one">Verschiebe %1$d E-Mail nach %2$s ?</item>
-        <item quantity="other">Verschiebe %1$d E-Mail nach %2$s ?</item>
+        <item quantity="one">Verschiebe eine E-Mail nach %2$s ?</item>
+        <item quantity="other">Verschiebe %1$d E-Mails nach %2$s ?</item>
     </plurals>
     <string name="title_notification_failed">\'%1$s\' fehlgeschlagen</string>
     <string name="menu_setup">Einstellungen</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 296fcd0ce0..fabbd0bfe7 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
     <string name="app_copyright">版权所有 &#x24B8; 2018，M. Bokhorst</string>
-    <string name="app_welcome">FairEmail is an open source email app focused on privacy and security. For this reason some features might work differently from what you are used to.</string>
+    <string name="app_welcome">FairEmail是一个专注于隐私与安全的开源电子邮件软件。基于此某些功能的工作方式可能与您习惯的功能不同。</string>
     <string name="channel_service">服务</string>
     <string name="channel_notification">通知</string>
     <string name="channel_error">错误</string>
@@ -26,7 +26,7 @@
         <item quantity="other">%1$d则新邮件</item>
     </plurals>
     <plurals name="title_moving_messages">
-        <item quantity="other">Move %1$d messages to %2$s ?</item>
+        <item quantity="other">移动 %1$d 邮件到  %2$s 吗？</item>
     </plurals>
     <string name="title_notification_failed">“%1$s”失败</string>
     <string name="menu_setup">设置</string>
@@ -40,7 +40,7 @@
     <string name="menu_invite">邀请好友</string>
     <string name="menu_rate">给这个应用打分</string>
     <string name="menu_other">其他应用</string>
-    <string name="title_welcome">Welcome</string>
+    <string name="title_welcome">欢迎</string>
     <string name="title_eula">最终用户许可协议</string>
     <string name="title_agree">我同意</string>
     <string name="title_disagree">我不同意</string>
@@ -78,11 +78,11 @@
     <string name="title_setup_dark_theme">暗色主题</string>
     <string name="title_setup_black_background">黑色背景</string>
     <string name="title_advanced">高级选项</string>
-    <string name="title_advanced_section_general">General</string>
-    <string name="title_advanced_section_connection">Connection</string>
-    <string name="title_advanced_section_display">Display</string>
-    <string name="title_advanced_section_behavior">Behavior</string>
-    <string name="title_advanced_section_misc">Miscellaneous</string>
+    <string name="title_advanced_section_general">常规​​​​​</string>
+    <string name="title_advanced_section_connection">连接</string>
+    <string name="title_advanced_section_display">显示</string>
+    <string name="title_advanced_section_behavior">行为</string>
+    <string name="title_advanced_section_misc">杂项</string>
     <string name="title_advanced_enabled">同步</string>
     <string name="title_advanced_metered">使用按流量计费的连接</string>
     <string name="title_advanced_unified">聚合收件箱</string>
@@ -92,22 +92,22 @@
     <string name="title_advanced_identicons">显示哈希头像</string>
     <string name="title_advanced_preview">显示邮件预览</string>
     <string name="title_advanced_light">使用指示灯</string>
-    <string name="title_advanced_sound">Select notification sound</string>
+    <string name="title_advanced_sound">选择通知提示音</string>
     <string name="title_advanced_browse">浏览服务器上的消息</string>
     <string name="title_advanced_swipe">滑动操作</string>
-    <string name="title_advanced_actionbar">Conversation action bar</string>
+    <string name="title_advanced_actionbar">对话操作栏</string>
     <string name="title_advanced_autoclose">自动关闭对话</string>
     <string name="title_advanced_confirm">确认执行可能泄露隐私敏感信息的操作</string>
     <string name="title_advanced_sender">允许编辑发件人地址</string>
     <string name="title_advanced_download">在计量的连接下自动下载邮件和附件, 最高可达</string>
     <string name="title_advanced_updates">检查更新</string>
     <string name="title_advanced_debug">调试模式</string>
-    <string name="title_advanced_enabled_hint">Globally disable or enable receiving and sending of messages</string>
-    <string name="title_advanced_metered_hint">Metered connections are generally mobile connections or paid Wi-Fi hotspots</string>
-    <string name="title_advanced_browse_hint">Download more messages when scrolling down</string>
-    <string name="title_advanced_unified_hint">Show unified inbox folders or unified inbox messages</string>
-    <string name="title_advanced_threading_hint">Group messages related to each other</string>
-    <string name="title_advanced_autoclose_hint">Automatically close conversation threads when all messages are archived, sent or trashed</string>
+    <string name="title_advanced_enabled_hint">全局禁用或启用邮件的接收和发送</string>
+    <string name="title_advanced_metered_hint">计量连接通常是指移动连接或付费WiFi热点</string>
+    <string name="title_advanced_browse_hint">向下滚动时下载更多邮件</string>
+    <string name="title_advanced_unified_hint">显示统一收件箱文件夹或统一收件箱邮件</string>
+    <string name="title_advanced_threading_hint">对相互关联的邮件进行分组</string>
+    <string name="title_advanced_autoclose_hint">在所有邮件存档、发送或丢弃时自动关闭对话线程</string>
     <string name="title_advanced_sender_hint">大多数提供商不允许修改发件人地址</string>
     <string name="title_select">选择 &#8230;</string>
     <string name="title_identity_name">姓名</string>
@@ -164,7 +164,7 @@
     <string name="title_empty_trash">清空垃圾箱</string>
     <string name="title_edit_properties">编辑属性</string>
     <string name="title_empty_trash_ask">永久性删除所有垃圾邮件</string>
-    <string name="title_delete_operation">Delete operations with an error message?</string>
+    <string name="title_delete_operation">是否删除带有错误消息的操作？</string>
     <string name="title_folder_name">文件夹名</string>
     <string name="title_display_name">显示昵称</string>
     <string name="title_hide_folders">隐藏隐藏的文件夹</string>
@@ -172,15 +172,15 @@
     <string name="title_hide_folder">从列表中隐藏</string>
     <string name="title_unified_folder">在统一的收件箱中显示</string>
     <string name="title_synchronize_folder">同步文件夹（接收）</string>
-    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_download_folder">Automatically download message texts and attachments</string>
-    <string name="title_notify_folder">Notify new messages</string>
+    <string name="title_poll_folder">定期检查而非持续同步</string>
+    <string name="title_download_folder">自动下载邮件文本和附件</string>
+    <string name="title_notify_folder">通知新邮件</string>
     <string name="title_sync_days">同步邮件(天)</string>
-    <string name="title_sync_days_remark">Increasing this value will increase battery and data usage</string>
+    <string name="title_sync_days_remark">增加该值将增加电池和数据的使用量</string>
     <string name="title_keep_days">保留邮件(天)</string>
-    <string name="title_keep_all">Keep all messages</string>
+    <string name="title_keep_all">保留所有邮件</string>
     <string name="title_folder_exists">文件夹 %1$s 存在</string>
-    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
+    <string name="title_folder_delete">是否永久删除此文件夹及其包含的任何邮件？</string>
     <string name="title_folder_unified">聚合收件箱</string>
     <string name="title_folder_inbox">收件箱</string>
     <string name="title_folder_outbox">发件箱</string>
@@ -216,24 +216,24 @@
     <string name="title_move">移动</string>
     <string name="title_archive">存档</string>
     <string name="title_reply">回复</string>
-    <string name="title_moving">Moving to %1$s</string>
+    <string name="title_moving">移动到%1$s</string>
     <string name="title_open_with">打开方式</string>
     <string name="title_no_answers">未定义回复模板</string>
     <string name="title_no_viewer">未找到能打开%1$s的应用程序</string>
     <string name="title_no_saf">存储访问框架不可用</string>
     <string name="title_no_contacts">联系选择器不可用</string>
     <string name="title_attachment_saved">附件已保存</string>
-    <string name="title_attachment_unavailable">Some attachments are not downloaded and will not be added, continue?</string>
-    <string name="title_image_unavailable">Some images are not downloaded and will not be added, continue?</string>
+    <string name="title_attachment_unavailable">一些附件未被下载并将不会添加，仍要继续吗？</string>
+    <string name="title_image_unavailable">一些附件未被下载并将不会添加，仍要继续吗？</string>
     <string name="title_ask_delete">确定要永久删除邮件吗？</string>
     <string name="title_ask_delete_selected">是否永久性删除选定的邮件？</string>
     <string name="title_ask_delete_answer">是否永久性删除回复模板？</string>
     <string name="title_ask_discard">丢弃草稿？</string>
     <string name="title_ask_save">保存更改？</string>
-    <string name="title_ask_spam">Report as spam?</string>
+    <string name="title_ask_spam">报告为垃圾邮件？</string>
     <string name="title_ask_show_html">显示原件可能会泄露隐私敏感信息</string>
     <string name="title_ask_show_image">显示图像可能会泄露隐私敏感信息</string>
-    <string name="title_sync_queued">Synchronization will take place on next account connection</string>
+    <string name="title_sync_queued">同步将在下次账号连接时进行</string>
     <string name="title_fix">修复</string>
     <string name="title_compose">撰写</string>
     <string name="title_from">发件人：</string>
@@ -275,10 +275,10 @@
     <string name="title_sort_on_time">时间</string>
     <string name="title_sort_on_unread">未读</string>
     <string name="title_sort_on_starred">星标记</string>
-    <string name="title_zoom">Text size</string>
-    <string name="title_address_sent">Sent:</string>
-    <string name="title_address_unsent">Unsent:</string>
-    <string name="title_address_invalid">Invalid:</string>
+    <string name="title_zoom">文本大小</string>
+    <string name="title_address_sent">发送：</string>
+    <string name="title_address_unsent">未发送:</string>
+    <string name="title_address_invalid">无效：</string>
     <string name="title_move_sent">移动到已发送</string>
     <string name="title_previous">上一则</string>
     <string name="title_next">下一则</string>
@@ -291,7 +291,7 @@
     <string name="title_action_archive">存档</string>
     <string name="title_action_trash">垃圾箱</string>
     <string name="title_legend_inbox">收件箱</string>
-    <string name="title_legend_notify">Notify new messages</string>
+    <string name="title_legend_notify">通知新邮件</string>
     <string name="title_legend_unified">聚合收件箱</string>
     <string name="title_legend_archive">存档</string>
     <string name="title_legend_trash">垃圾箱</string>
@@ -313,8 +313,8 @@
     <string name="title_legend_synchronizing">正在同步</string>
     <string name="title_legend_downloading">下载中</string>
     <string name="title_legend_closing">正在结束</string>
-    <string name="title_legend_metered">Connection is metered</string>
-    <string name="title_legend_unmetered">Connection is unmetered</string>
+    <string name="title_legend_metered">连接是计量的</string>
+    <string name="title_legend_unmetered">连接是不计量的</string>
     <string name="title_legend_sync_keep">同步/保留邮件的天数</string>
     <string name="title_legend_download_fetch">下载的邮件正文数/获取的标头数</string>
     <string name="title_hint_folder_actions">长按以显示更多选项</string>
@@ -323,7 +323,7 @@
     <string name="title_hint_message_selection">长按一则邮件以开始选择多则邮件</string>
     <string name="title_hint_sync">下载邮件可能需要一些时间, 具体取决于提供商的速度、网络连接、设备以及邮件数量。在下载邮件时, 应用的响应速度可能会变慢。</string>
     <string name="title_open_link">打开链接</string>
-    <string name="title_select_app">Select app</string>
+    <string name="title_select_app">选择应用</string>
     <string name="title_updated">有新的版本%1$s可用</string>
     <string name="title_issue">您要提问或有问题吗？</string>
     <string name="title_yes">是</string>
@@ -343,7 +343,7 @@
     <string name="title_pro_support">FairEmail需要您的帮助，点击购买专业版以保持项目的进展</string>
     <string name="title_unexpected_error">未知错误</string>
     <string name="title_log">日志</string>
-    <string name="title_auto_scroll">Auto scroll</string>
+    <string name="title_auto_scroll">自动滚动</string>
     <string name="title_debug_info">调试信息</string>
     <string name="title_debug_info_remark">请描述问题及问题发生的时间：</string>
     <string name="title_crash_info_remark">请描述应用崩溃时您的操作</string>