diff --git a/F-Droid/res/values-es/strings.xml b/F-Droid/res/values-es/strings.xml
index 2bfc64635..a031bd2dd 100644
--- a/F-Droid/res/values-es/strings.xml
+++ b/F-Droid/res/values-es/strings.xml
@@ -137,6 +137,7 @@ La dirección de un repositorio es algo similar a esto: https://f-droid.org/repo
   <string name="status_connecting_to_repo">Conectando a
 %1$s</string>
   <string name="status_checking_compatibility">Comprobando la compatibilidad de las aplicaciones con tu dispositivo…</string>
+  <string name="status_inserting">Guardando detalles de las aplicaciones (%1$d%%)</string>
   <string name="no_permissions">No se usan permisos.</string>
   <string name="permissions_for_long">Permisos para la versión %s</string>
   <string name="showPermissions">Mostrar permisos</string>
diff --git a/F-Droid/res/values-ja/strings.xml b/F-Droid/res/values-ja/strings.xml
index 20d82792c..cc9931af0 100644
--- a/F-Droid/res/values-ja/strings.xml
+++ b/F-Droid/res/values-ja/strings.xml
@@ -158,6 +158,7 @@ GNU GPLv3 ライセンスに基づいてリリースされました.</string>
   <string name="repo_last_update">最終更新</string>
   <string name="repo_update">更新</string>
   <string name="repo_name">名前</string>
+  <string name="unsigned_description">アプリケーションのリストは検証されていません. 未署名の索引からアプリケーションをダウンロードする時は注意してください.</string>
   <string name="repo_not_yet_updated">このリポジトリはまだ使用されていません.
 アプリケーションを表示するためには, リポジトリを更新する必要があります.
 
diff --git a/F-Droid/res/values-ro/strings.xml b/F-Droid/res/values-ro/strings.xml
index 67ea92024..b70cc3406 100644
--- a/F-Droid/res/values-ro/strings.xml
+++ b/F-Droid/res/values-ro/strings.xml
@@ -4,9 +4,15 @@
   <string name="searchres_oneapp">Sa gasit o aplicatie potrivita cu \'%s\'</string>
   <string name="searchres_noapps">Nu exita aplicatii potrivite cu \'%s\':</string>
   <string name="version">Versiune</string>
+  <string name="edit">Editează</string>
+  <string name="delete">Şterge</string>
   <string name="cache_downloaded">Istoric aplicatii descarcate</string>
+  <string name="cache_downloaded_off">Nu păstra fişierele apk</string>
   <string name="updates">Noutati</string>
+  <string name="other">Altele</string>
+  <string name="never">niciodata</string>
   <string name="notify">Notificare</string>
+  <string name="app_details">Detalii aplicaţie</string>
   <string name="about_title">Despre F-Droid</string>
   <string name="about_desc">Bazat pe Aptoide.
 Distribuit sub licenta GNU GPLv3.</string>
@@ -14,6 +20,7 @@ Distribuit sub licenta GNU GPLv3.</string>
   <string name="about_mail">Email</string>
   <string name="about_version">Versiune</string>
   <string name="about_website">Website</string>
+  <string name="inst">Instalat</string>
   <string name="not_inst">Nu este instalat</string>
   <string name="ok">Aplica</string>
   <string name="yes">Da</string>
@@ -21,10 +28,41 @@ Distribuit sub licenta GNU GPLv3.</string>
   <string name="repo_add_title">Adaugare depozit aplicatii nou</string>
   <string name="repo_add_add">Adauga</string>
   <string name="cancel">Anuleaza</string>
+  <string name="enable">Activează</string>
   <string name="repo_delete_title">Alegeti depozitul pentru stergere</string>
   <string name="repo_update_title">Actualizare depozit aplicatii</string>
   <string name="tab_noninstalled">Disponibil</string>
   <string name="tab_updates">Actualizare</string>
+  <string name="one_update_available">1 actualizare e disponibilă.</string>
+  <string name="many_updates_available">%d actualizări sunt disponibile</string>
   <string name="process_wait_title">Asteptati…</string>
   <string name="process_update_msg">Se actualizeaza lista…</string>
+  <string name="menu_preferences">Preferinţe</string>
+  <string name="menu_about">Despre</string>
+  <string name="menu_search">Caută</string>
+  <string name="menu_launch">Porneşte</string>
+  <string name="menu_install">Instalează</string>
+  <string name="menu_uninstall">Dezinstalează</string>
+  <string name="menu_ignore_all">Ignoră toate actualizările</string>
+  <string name="menu_website">Website</string>
+  <string name="menu_donate">Donează</string>
+  <string name="details_notinstalled">Nu e instalat</string>
+  <string name="corrupt_download">Fişierul descărcat e corupt</string>
+  <string name="download_cancelled">Descărcare anulată</string>
+  <string name="display">Afişează</string>
+  <string name="expert">Expert</string>
+  <string name="rooted">Root</string>
+  <string name="ignoreTouch_on">Tot</string>
+  <string name="category_all">Tot</string>
+  <string name="category_whatsnew">Ce este nou</string>
+  <string name="category_recentlyupdated">Actualizat recent</string>
+  <string name="showPermissions">Arată permisiunile</string>
+  <string name="theme">Temă</string>
+  <string name="repo_url">URL</string>
+  <string name="repo_num_apps">Număr de aplicaţii</string>
+  <string name="repo_last_update">Ultima actualizare</string>
+  <string name="repo_update">Actualizează</string>
+  <string name="repo_name">Nume</string>
+  <string name="unknown">Necunoscut</string>
+  <string name="requires_features">Necesită: %1$</string>
 </resources>
diff --git a/F-Droid/res/values-sr/array.xml b/F-Droid/res/values-sr/array.xml
index c2afe9a19..212121549 100644
--- a/F-Droid/res/values-sr/array.xml
+++ b/F-Droid/res/values-sr/array.xml
@@ -4,6 +4,7 @@
     <item>Никада</item>
     <item>Свака 4 сата</item>
     <item>Сваких 12 сати</item>
+    <item>Сваких 12 сати</item>
   </string-array>
   <string-array name="themeNames">
     <item>Тамна</item>
diff --git a/F-Droid/res/values-zh-rCN/array.xml b/F-Droid/res/values-zh-rCN/array.xml
index 19460c2c1..c11b54cef 100644
--- a/F-Droid/res/values-zh-rCN/array.xml
+++ b/F-Droid/res/values-zh-rCN/array.xml
@@ -2,6 +2,8 @@
 <resources>
   <string-array name="updateIntervalNames">
     <item>从不</item>
+    <item>每 4 小时</item>
+    <item>每 12 小时</item>
     <item>每天</item>
   </string-array>
   <string-array name="themeNames">
diff --git a/F-Droid/res/values-zh-rCN/strings.xml b/F-Droid/res/values-zh-rCN/strings.xml
index d906fcf33..0b4987b39 100644
--- a/F-Droid/res/values-zh-rCN/strings.xml
+++ b/F-Droid/res/values-zh-rCN/strings.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="searchres_napps">找到 %1$d 个符合关键词 \'%2$s\' 的应用：</string>
+  <string name="searchres_oneapp">找到 1 个符合关键词 \'%s\' 的应用：</string>
+  <string name="searchres_noapps">没有找到符合 \'%s\' 的应用</string>
   <string name="SignatureMismatch">新版本签名与旧版本不同，请先卸载旧版本应用再安装新版本。（注意：卸载旧版本会清除该应用的所有已储存数据）</string>
   <string name="installIncompatible">该应用程序好像与您的设备不兼容。您仍然要尝试安装吗？</string>
   <string name="installDowngrade">您正在降级该应用程序。这样做可能会使该程序无法工作，甚至丢失您的数据。您仍然要尝试降级吗？</string>
@@ -7,10 +10,11 @@
   <string name="edit">编辑</string>
   <string name="delete">删除</string>
   <string name="enable_nfc_send">启用NFC发送…</string>
-  <string name="cache_downloaded_on">将已下载的apk文件保留再SD卡上</string>
+  <string name="cache_downloaded">已下载应用缓存</string>
   <string name="cache_downloaded_off">不保留任何的apk文件</string>
   <string name="updates">升级</string>
   <string name="other">其它</string>
+  <string name="last_update_check">最近一次软件库扫描: %s</string>
   <string name="never">从不</string>
   <string name="update_interval">自动更新周期</string>
   <string name="update_interval_zero">不自动升级应用程序列表</string>
@@ -18,17 +22,17 @@
   <string name="automatic_scan_wifi_on">仅在启用wifi时自动更新应用程序列表</string>
   <string name="automatic_scan_wifi_off">总是自动更新应用程序列表</string>
   <string name="notify">通知</string>
-  <string name="notify_on">当更新可用时显示通知</string>
-  <string name="notify_off">从不通知任何更新</string>
   <string name="update_history">更新历史</string>
   <string name="update_history_summ">相隔多少天的应用程序将会被当作较新的程序：%s</string>
   <string name="search_results">搜索结果</string>
   <string name="app_details">应用程序详情</string>
   <string name="no_such_app">未找到此类应用程序</string>
+  <string name="about_title">关于 F-Droid</string>
   <string name="about_desc">最初基于 Aptoide.
 在以下许可协议下发布：
 		GNU GPLv3 license.</string>
   <string name="about_site">网站：</string>
+  <string name="about_mail">Email:</string>
   <string name="about_version">版本：</string>
   <string name="about_website">网站</string>
   <string name="no_repo">您没有配置任何的应用程序仓库！
@@ -41,24 +45,46 @@ https://f-droid.org/repo</string>
   <string name="not_inst">未安装</string>
   <string name="added_on">添加于 %s</string>
   <string name="ok">OK</string>
+  <string name="yes">确认</string>
+  <string name="no">取消</string>
+  <string name="repo_add_title">添加新的软件源</string>
+  <string name="repo_add_add">添加</string>
   <string name="cancel">取消</string>
   <string name="enable">启用</string>
   <string name="add_key">添加密钥</string>
   <string name="overwrite">覆盖</string>
+  <string name="repo_delete_title">选择要移除的软件源</string>
+  <string name="repo_update_title">更新软件源</string>
   <string name="tab_noninstalled">可安装</string>
+  <string name="tab_updates">更新</string>
   <string name="one_update_available">有 1 个可用的更新。</string>
   <string name="many_updates_available">有 %d 个可用的更新。</string>
   <string name="fdroid_updates_available">有可用的 F-Droid 更新</string>
+  <string name="process_wait_title">请稍等</string>
+  <string name="process_update_msg">正在更新应用程序列表...</string>
+  <string name="download_server">正在下载应用列表从</string>
   <string name="nfc_is_not_enabled">NFC 未启用！</string>
   <string name="go_to_nfc_settings">前往 NFC 设置…</string>
   <string name="bluetooth_activity_not_found">未找到蓝牙发送方式，请选择一个！</string>
   <string name="choose_bt_send">选择蓝牙发送方式</string>
+  <string name="repo_add_url">软件源地址</string>
   <string name="repo_add_fingerprint">指纹（可选）</string>
   <string name="repo_exists">该软件仓库已经存在！</string>
+  <string name="repo_exists_add_fingerprint">此软件源已经设置，该操作将会添加新的密钥信息。</string>
+  <string name="repo_exists_enable">此软件源已经设置，请确认您是否要重新启用它。</string>
+  <string name="repo_exists_and_enabled">此软件源已经设置好并已启用！</string>
+  <string name="repo_delete_to_overwrite">在您添加不同密钥的软件源之前，您需要先删除该软件源！</string>
+  <string name="malformed_repo_uri">忽略异常格式的软件源URI：%s</string>
+  <string name="repo_alrt">已使用的软件源列表有变动。
+您想要更新该列表吗？</string>
+  <string name="menu_update_repo">更新软件源</string>
+  <string name="menu_manage">管理软件源</string>
   <string name="menu_send_apk_bt">通过蓝牙发送 FDroid.apk…</string>
   <string name="menu_preferences">设置</string>
   <string name="menu_about">关于</string>
   <string name="menu_search">搜索</string>
+  <string name="menu_add_repo">添加新软件源</string>
+  <string name="menu_rem_repo">移除软件源</string>
   <string name="menu_scan_repo">查找本地软件仓库</string>
   <string name="menu_launch">运行</string>
   <string name="menu_share">分享</string>
@@ -71,20 +97,26 @@ https://f-droid.org/repo</string>
   <string name="menu_source">源代码</string>
   <string name="menu_upgrade">升级</string>
   <string name="menu_donate">捐赠</string>
+  <string name="details_installed">已安装版本 %s</string>
   <string name="details_notinstalled">未安装</string>
+  <string name="corrupt_download">下载的文件已损坏</string>
+  <string name="download_cancelled">下载已取消</string>
   <string name="antiadslist">该应用程序包含广告</string>
   <string name="antitracklist">该应用程序会跟踪并报告您的活动</string>
   <string name="antinonfreeadlist">该应用程序会推广非自由免费的插件或扩展</string>
-  <string name="antinonfreenetlist">该应用程序会推广非自由免费网络服务</string>
-  <string name="antinonfreedeplist">该应用程序依赖于其它非自由免费的应用程序</string>
-  <string name="antiupstreamnonfreelist">上游源代码不是完全自由公开的</string>
   <string name="display">显示</string>
+  <string name="expert">高级</string>
+  <string name="expert_on">显示额外信息并启用额外选项</string>
+  <string name="expert_off">为有经验用户隐藏额外选项</string>
+  <string name="search_hint">搜索应用程序</string>
+  <string name="appcompatibility">应用程序兼容性</string>
   <string name="show_incompat_versions">不兼容的版本</string>
   <string name="show_incompat_versions_on">显示与该设备不兼容的应用程序版本</string>
   <string name="show_incompat_versions_off">隐藏与该设备不兼容的应用程序版本</string>
   <string name="rooted">Root</string>
   <string name="rooted_on">不以灰色显示需要root权限的应用程序</string>
   <string name="rooted_off">以灰色显示需要root权限的应用程序</string>
+  <string name="ignoreTouch">忽略触屏应用</string>
   <string name="ignoreTouch_on">总是包含需要触屏的应用程序</string>
   <string name="ignoreTouch_off">正常过滤应用程序</string>
   <string name="category_all">全部</string>
@@ -105,20 +137,39 @@ https://f-droid.org/repo</string>
   <string name="no_permissions">未使用任何权限。</string>
   <string name="permissions_for_long">版本 %s 的权限</string>
   <string name="showPermissions">显示权限</string>
+  <string name="showPermissions_on">显示应用程序所需的权限清单</string>
+  <string name="showPermissions_off">在下载之前不显示权限</string>
+  <string name="no_handler_app">你没有可处理 %s 的应用程序</string>
   <string name="compactlayout">紧凑布局</string>
   <string name="compactlayout_on">显示小图标</string>
   <string name="compactlayout_off">显示正常图标</string>
   <string name="theme">主题</string>
   <string name="unsigned">未签名</string>
   <string name="repo_url">URL</string>
-  <string name="repo_num_apps">应用程序数</string>
   <string name="repo_fingerprint">应用程序签名密钥指纹 (SHA-256)</string>
   <string name="repo_description">描述</string>
   <string name="repo_last_update">上次更新</string>
   <string name="repo_update">更新</string>
   <string name="repo_name">名称</string>
+  <string name="unsigned_description">这意味着应用程序清单可以被认证。对于从未签名来源下载的应用程序您应该小心。</string>
+  <string name="repo_not_yet_updated">该软件源尚未使用。
+要想查看该软件源提供的应用程序，您需要先更新它。
+
+更新之后，软件描述以及其它细节将会在这里显示。</string>
+  <string name="repo_delete_details">您想要删除软件源 \"{0}\" 吗？
+该软件源含有 {1} 个软件。任何已经安装的软件都不会被卸载，但是您以后将不能通过 F-Droid 来更新它们。</string>
   <string name="unknown">未知</string>
-  <string name="repo_confirm_delete_title">删除应用程序仓库？</string>
+  <string name="repo_confirm_delete_body">删除软件源意味着
+来自该软件源的软件将不会出现在F-Droid上。
+
+注意：
+所有之前已经安装的软件将仍然保留在您的设备上。</string>
+  <string name="repo_disabled_notification">已禁用 \"%1$s\"。
+
+若要从该软件源安装该软件，您需要重新启用它。</string>
   <string name="minsdk_or_later">%s 或更高</string>
+  <string name="up_to_maxsdk">最多 %s 个</string>
+  <string name="minsdk_up_to_maxsdk">%1$s 到 %2$s 个</string>
+  <string name="not_on_same_wifi">您的设备与刚刚添加的本地软件源不再同一个WiFi上！尝试加入该网络：%s</string>
   <string name="requires_features">需要：%1$s</string>
 </resources>
diff --git a/F-Droid/res/values-zh-rHK/array.xml b/F-Droid/res/values-zh-rHK/array.xml
index aa21a883f..bb8a2ecd9 100644
--- a/F-Droid/res/values-zh-rHK/array.xml
+++ b/F-Droid/res/values-zh-rHK/array.xml
@@ -7,4 +7,8 @@
     <item>每12小時</item>
     <item>每天</item>
   </string-array>
+  <string-array name="themeNames">
+    <item>深</item>
+    <item>淺</item>
+  </string-array>
 </resources>