diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 75ea8a56..282f16e5 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -444,14 +444,10 @@
     <string name="use_tor_summary">Força la connexió a través de Tor per millorar la privacitat. Requereix Orbot. Desactiva les opcions del proxy.</string>
 
     <string name="socks_proxy_address_title">Proxy SOCKS5</string>
-    <string name="socks_proxy_address_example">socks5://192.168.0.1:1080</string>
-
     <!-- Toast after entering invalid socks proxy address -->
     <string name="toast_invalid_socks_proxy_address">No compleix la sintaxi de proxy \'socks5://[IP/HOSTNAME]:[PORT]\'</string>
 
     <string name="http_proxy_address_title">Proxy HTTP(S)</string>
-    <string name="http_proxy_address_example">http://192.168.0.1:8080</string>
-
     <!-- Toast after entering invalid http proxy address -->
     <string name="toast_invalid_http_proxy_address">No compleix la sintaxi de proxy \'http://[IP/HOSTNAME]:[PORT]\'</string>
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ba883513..bf06bf79 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -490,14 +490,10 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
     <string name="use_tor_summary">Der gesamte Netzwerkverkehr wird zur Erhöhung der Privatsphäre über Tor geleitet. Benötigt Orbot. Deaktiviert die Proxy-Optionen.</string>
 
     <string name="socks_proxy_address_title">SOCKS5-Proxy</string>
-    <string name="socks_proxy_address_example">socks5://192.168.0.1:1080</string>
-
     <!-- Toast after entering invalid socks proxy address -->
     <string name="toast_invalid_socks_proxy_address">Die Eingabe entspricht nicht der Form \'socks5://[IP/HOSTNAME]:[PORT]\'.</string>
 
     <string name="http_proxy_address_title">HTTP(S)-Proxy</string>
-    <string name="http_proxy_address_example">http://192.168.0.1:8080</string>
-
     <!-- Toast after entering invalid http proxy address -->
     <string name="toast_invalid_http_proxy_address">Die Eingabe entspricht nicht der Form \'http://[IP/HOSTNAME]:[PORT]\'.</string>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d0656b3e..63797e20 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -307,14 +307,10 @@
     <string name="use_tor_summary">Forcer tout le trafic à travers Tor mieux préserver sa vie privée. Nécessite Orbot. Désactive les options de proxy.</string>
 
     <string name="socks_proxy_address_title">Proxy SOCKS5</string>
-    <string name="socks_proxy_address_example">socks5://192.168.0.1:1080</string>
-
     <!-- Toast after entering invalid socks proxy address -->
     <string name="toast_invalid_socks_proxy_address">L\'entrée ne respecte pas la syntaxe du proxy \'socks5://[IP/HOSTNAME]:[PORT]\'</string>
 
     <string name="http_proxy_address_title">Proxy HTTP(S)</string>
-    <string name="http_proxy_address_example">http://192.168.0.1:8080</string>
-
     <!-- Toast after entering invalid http proxy address -->
     <string name="toast_invalid_http_proxy_address">L\'entrée ne respecte pas la syntaxe du proxy \'http://[IP/HOSTNAME]:[PORT]\'</string>
 
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 708b641c..79d530c5 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -299,14 +299,10 @@ Az összesített statisztika nyilvánosan elérhető a https://data.syncthing.ne
     <string name="use_tor_summary">A megnövelt biztonság érdekében minden forgalom a TOR-on keresztül. Orbot szükséges. Letiltja a proxy beállításokat.</string>
 
     <string name="socks_proxy_address_title">SOCKS5 proxy</string>
-    <string name="socks_proxy_address_example">socks5://192.168.0.1:1080</string>
-
     <!-- Toast after entering invalid socks proxy address -->
     <string name="toast_invalid_socks_proxy_address">A bemenet sérti a proxy szintaxist \'socks5://[IP/HOSTNAME]:[PORT]\'</string>
 
     <string name="http_proxy_address_title">HTTP(S) proxy</string>
-    <string name="http_proxy_address_example">http://192.168.0.1:8080</string>
-
     <!-- Toast after entering invalid http proxy address -->
     <string name="toast_invalid_http_proxy_address">A bemenet sérti a proxy szintaxist \'http://[IP/HOSTNAME]:[PORT]\'</string>
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c211d0d9..93ae7b00 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -304,14 +304,10 @@
     <string name="use_tor_summary">Forza tutto il traffico attraverso Tor per una maggiore privacy. Richiede Orbot. Disabilita le opzioni proxy.</string>
 
     <string name="socks_proxy_address_title">Proxy SOCKS5</string>
-    <string name="socks_proxy_address_example">socks5://192.168.0.1:1080</string>
-
     <!-- Toast after entering invalid socks proxy address -->
     <string name="toast_invalid_socks_proxy_address">Il dato inserito viola la sintassi del proxy \'socks5://[IP/HOSTNAME]:[PORT]\'</string>
 
     <string name="http_proxy_address_title">Proxy HTTP(S)</string>
-    <string name="http_proxy_address_example">http://192.168.0.1:8080</string>
-
     <!-- Toast after entering invalid http proxy address -->
     <string name="toast_invalid_http_proxy_address">Il dato inserito viola la sintassi del proxy \'http://[IP/HOSTNAME]:[PORT]\'</string>
 
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 2c04884a..38e6937c 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -326,14 +326,10 @@
     <string name="use_tor_summary">Dwing alle verkeer door Tor voor verhoogde privacy. Schakelt proxyopties uit.</string>
 
     <string name="socks_proxy_address_title">SOCKS5-proxy</string>
-    <string name="socks_proxy_address_example">socks5://192.168.0.1:1080</string>
-
     <!-- Toast after entering invalid socks proxy address -->
     <string name="toast_invalid_socks_proxy_address">Invoer is geen correcte proxysyntax \'socks5://[IP/HOSTNAME]:[PORT]\'</string>
 
     <string name="http_proxy_address_title">HTTP(S)-proxy</string>
-    <string name="http_proxy_address_example">http://192.168.0.1:8080</string>
-
     <!-- Toast after entering invalid http proxy address -->
     <string name="toast_invalid_http_proxy_address">Invoer is geen correcte proxysyntax \'http://[IP/HOSTNAME]:[PORT]\'</string>
 
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index aa40f703..3d67625c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -299,14 +299,10 @@
     <string name="use_tor_summary">Force todo o tráfego através do Tor para aumentar privacidade. Orbot é necessário. Desabilita opções de proxy.</string>
 
     <string name="socks_proxy_address_title">SOCKS5 proxy</string>
-    <string name="socks_proxy_address_example">socks5://192.168.0.1:1080</string>
-
     <!-- Toast after entering invalid socks proxy address -->
     <string name="toast_invalid_socks_proxy_address">Entrada viola sintaxe do proxy \'socks5://[IP/HOSTNAME]:[PORT]\'</string>
 
     <string name="http_proxy_address_title">HTTP(S) proxy</string>
-    <string name="http_proxy_address_example">http://192.168.0.1:8080</string>
-
     <!-- Toast after entering invalid http proxy address -->
     <string name="toast_invalid_http_proxy_address">Entrada viola sintaxe do proxy \'http://[IP/HOSTNAME]:[PORT]\'</string>
 
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 1d85c31c..a563a810 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -336,14 +336,10 @@
     <string name="use_tor_summary">Forțează tot traficul prin rețeaua Tor pentru a spori confidențialitatea. Necesită aplicația Orbot. Dezactivează opțiunile proxy.</string>
 
     <string name="socks_proxy_address_title">Proxy SOCKS5</string>
-    <string name="socks_proxy_address_example">socks5://192.168.0.1:1080</string>
-
     <!-- Toast after entering invalid socks proxy address -->
     <string name="toast_invalid_socks_proxy_address">Textul nu respectă sintaxa proxy \'socks5://[IP/HOSTNAME]:[PORT]\'</string>
 
     <string name="http_proxy_address_title">Proxy HTTP(S)</string>
-    <string name="http_proxy_address_example">http://192.168.0.1:8080</string>
-
     <!-- Toast after entering invalid http proxy address -->
     <string name="toast_invalid_http_proxy_address">Textul nu respectă sintaxa proxy \'http://[IP/HOSTNAME]:[PORT]\'</string>
 
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8f78a2d8..799ee914 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -360,14 +360,10 @@
     <string name="use_tor_summary">Для дополнительной приватности перенаправлять весь трафик через Tor. Требует наличия Orbot. Отключает опции прокси.</string>
 
     <string name="socks_proxy_address_title">SOCKS5 прокси</string>
-    <string name="socks_proxy_address_example">socks5://192.168.0.1:1080</string>
-
     <!-- Toast after entering invalid socks proxy address -->
     <string name="toast_invalid_socks_proxy_address">Данные не соответствуют синтаксису прокси \'socks5://[IP/HOSTNAME]:[PORT]\'</string>
 
     <string name="http_proxy_address_title">HTTP(S) прокси</string>
-    <string name="http_proxy_address_example">http://192.168.0.1:8080</string>
-
     <!-- Toast after entering invalid http proxy address -->
     <string name="toast_invalid_http_proxy_address">Данные не соответствуют синтаксису прокси \'http://[IP/HOSTNAME]:[PORT]\'</string>
 
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 032de7a4..6eb71e97 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -421,14 +421,10 @@
     <string name="use_tor_summary">Tvinga all trafik genom Tor för ökad integritet. Kräver Orbot. Inaktiverar proxyalternativ.</string>
 
     <string name="socks_proxy_address_title">SOCKS5-proxy</string>
-    <string name="socks_proxy_address_example">socks5://192.168.0.1:1080</string>
-
     <!-- Toast after entering invalid socks proxy address -->
     <string name="toast_invalid_socks_proxy_address">Inmatning bryter mot proxysyntaxen \'socks5://[IP/HOSTNAME]:[PORT]\'</string>
 
     <string name="http_proxy_address_title">HTTP(S)-proxy</string>
-    <string name="http_proxy_address_example">http://192.168.0.1:8080</string>
-
     <!-- Toast after entering invalid http proxy address -->
     <string name="toast_invalid_http_proxy_address">Inmatning bryter mot proxysyntaxen \'http://[IP/HOSTNAME]:[PORT]\'</string>
 
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index f9edd2fb..15bb0070 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -30,6 +30,7 @@
     <string name="back">返回</string>
     <string name="cont">继续</string>
     <string name="finish">完成</string>
+    <string name="generic_example">示例</string>
     <string name="generic_error">错误</string>
     <string name="generic_help">帮助</string>
     <string name="grant_permission">授予權限</string>
@@ -38,6 +39,10 @@
 
     <string name="ignore">忽略</string>
 
+    <string name="page_x_of_y">第%1$s页，共%2$s页</string>
+
+    <string name="main_menu">主菜单</string>
+
     <!-- Title of the exit app when running as a service confirmation dialog -->
     <string name="dialog_exit_while_running_as_service_title">再次确认以退出程序</string>
     <!-- Title of the "add folder" menu action -->
@@ -237,6 +242,9 @@
     <!-- Setting title -->
     <string name="introducer">介绍人</string>
 
+    <!-- Setting title -->
+    <string name="pause_device">暂停设备</string>
+
     <!-- ActionBar item -->
     <string name="delete_device">删除设备</string>
 
@@ -254,6 +262,9 @@
     <!-- Toast shown when trying to create a device with an empty ID -->
     <string name="device_id_required">设备标识不得为空</string>
 
+    <!-- Toast shown when trying to create a device with an empty name -->
+    <string name="device_name_required">设备名不可为空</string>
+
     <!-- Content description for device ID qr code icon -->
     <string name="scan_qr_code_description">扫描二维码</string>
 
@@ -288,12 +299,25 @@
 
     <!-- Preference screen - Run conditions -->
     <string name="run_conditions_title">运行条件</string>
+    <string name="run_conditions_summary">下方选项将控制 Syncthing 何时启用</string>
+
+    <string name="run_on_metered_wifi_summary">设备在付费 Wi-Fi 网络环境下启用 Syncthing
+警告：可能会产生大量费用</string>
+
+    <string name="specify_wifi_ssid_whitelist">选择 Wi-Fi 网络</string>
+    <string name="run_on_whitelisted_wifi_networks">已选择的 Wi-Fi 网络 : %1$s</string>
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">请打开无线网络连接并选择网络</string>
 
     <string name="respect_battery_saving_title">遵循 Android 电池省电模式设置</string>
+    <string name="respect_battery_saving_summary">省电模式启动时禁用 Syncthing</string>
+
+    <!-- Preferences - Behaviour -->
+    <string name="behaviour_autostart_title">自动启动</string>
+    <string name="behaviour_autostart_summary">系统开启时自动启动 Syncthing </string>
+
     <string name="use_root_title">Syncthing 运行于超级用户</string>
 
-    <string name="use_root_summary">该项功能不稳定，可能导致您的设备和 Syncthing 出问题。如果遇到了问题，您可能要重新安装 Syncthing。</string>
+    <string name="use_root_summary">该项功能不稳定，可能会导致您的设备和 Syncthing 出问题。如果遇到了问题，您可能要重新安装 Syncthing。</string>
 
     <string name="preference_language_title">语言</string>
 
@@ -305,6 +329,21 @@
 
     <string name="pref_language_default">默认语言</string>
 
+    <string-array name="folder_types">
+        <item>发送与接收</item>
+        <item>仅发送</item>
+        <item>仅接收</item>
+    </string-array>
+
+    <string-array name="pull_order_types">
+        <item>随机</item>
+        <item>拼音</item>
+        <item>小文件优先</item>
+        <item>大文件优先</item>
+        <item>旧文件优先</item>
+        <item>新文件优先</item>
+    </string-array>
+
     <string-array name="versioning_types">
         <item>无</item>
         <item>垃圾桶</item>
@@ -333,15 +372,28 @@
 
     <string name="usage_reporting">匿名使用报告</string>
 
+    <string name="webui_tcp_port_title">WebUI TCP端口</string>
+
+    <string name="webui_remote_access_title">远程控制 WebUI</string>
+
+    <!-- Titles for the preference to undo ignored devices and folders -->
+    <string name="undo_ignored_devices_folders_title">撤销忽略的设备和文件夹</string>
+    <string name="undo_ignored_devices_folders_question">该操作将会撤销现有已忽略的设备和文件夹的设置，是否继续？</string>
     <string name="export_config">导出设置</string>
 
+    <!-- Experimental options -->
+    <string name="use_proxy">使用代理</string>
+    <string name="do_not_use_proxy">代理未配置.</string>
+
     <string name="keep_wakelock_while_binary_running">当 Syncthing 正在运行时保持 CPU 唤醒</string>
 
     <string name="use_tor_title">使用 Tor</string>
 
+    <string name="use_tor_summary">强制所有的流量经由 Tor 代理，需要 Orbot，以及禁用其它代理选项。</string>
+
     <string name="use_legacy_hashing_title">使用传统哈希</string>
 
-    <string name="use_legacy_hashing_summary">强制 syncthing 使用传统哈希包出于兼容目的</string>
+    <string name="use_legacy_hashing_summary">强制 Syncthing 使用传统哈希包以提高兼容性</string>
 
     <!-- Dialog shown before config export -->
     <string name="dialog_confirm_export">您确定要导出您的配置？若您之前导出过配置，则文件会被当前导出的配置所覆盖。\n\n 警告！其他应用程序可以从您导出的配置文件中获取到您的密钥，并且可以通过它来下载或者修改您的同步文件。</string>
@@ -368,9 +420,23 @@
     <!-- Title for the preference to reset Syncthing indexes -->
     <string name="st_reset_database_title">重置数据库</string>
 
+    <!-- Syncthing was reset -->
+    <string name="st_reset_database_question">此项操作在执行前，建议您在获得我们团队的建议后再使用该功能。
+请问您确定要清除 Syncthing 的数据库？</string>
+
     <!-- Syncthing was reset -->
     <string name="st_reset_database_done">重置 Syncthing 数据库完成</string>
 
+    <!-- Title for the preference to reset Syncthing indexes -->
+    <string name="st_reset_deltas_title">重置 Delta 索引</string>
+
+    <!-- Syncthing was reset -->
+    <string name="st_reset_deltas_question">此项操作在执行前，建议您在获得我们团队的建议后再使用该功能。
+请问您确定要清除 Syncthing Delta 索引？</string>
+
+    <!-- Syncthing was reset -->
+    <string name="st_reset_deltas_done">已成功重置 Syncthing Delta 索引</string>
+
     <string name="category_about">关于</string>
 
     <!-- Settings item that opens the log activity -->
@@ -385,6 +451,15 @@
     <!-- Title of the preference showing upstream version name -->
     <string name="syncthing_version_title">Syncthing 版本</string>
 
+    <!-- Title of the preference showing the REST API key -->
+    <string name="syncthing_api_key">Syncthing API 秘钥 (点按复制)</string>
+
+    <!-- Shown when the API key is copied to the clipboard -->
+    <string name="api_key_copied_to_clipboard">Syncthing API 秘钥已复制到剪贴板</string>
+
+    <!-- Title of the preference showing database size -->
+    <string name="syncthing_database_size">Syncthing 数据库大小</string>
+
     <!-- FolderPickerAcitivity -->
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4bf3a83c..e4cba9a2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -490,13 +490,13 @@ Please report any problems you encounter via Github.</string>
     <string name="use_tor_summary">Force all traffic through Tor for increased privacy. Requires Orbot. Disables proxy options.</string>
 
     <string name="socks_proxy_address_title">SOCKS5 proxy</string>
-    <string name="socks_proxy_address_example">socks5://192.168.0.1:1080</string>
+    <string name="socks_proxy_address_example" translatable="false">socks5://192.168.0.1:1080</string>
 
     <!-- Toast after entering invalid socks proxy address -->
     <string name="toast_invalid_socks_proxy_address">Input violates proxy syntax \'socks5://[IP/HOSTNAME]:[PORT]\'</string>
 
     <string name="http_proxy_address_title">HTTP(S) proxy</string>
-    <string name="http_proxy_address_example">http://192.168.0.1:8080</string>
+    <string name="http_proxy_address_example" translatable="false">http://192.168.0.1:8080</string>
 
     <!-- Toast after entering invalid http proxy address -->
     <string name="toast_invalid_http_proxy_address">Input violates proxy syntax \'http://[IP/HOSTNAME]:[PORT]\'</string>