diff --git a/core/i18n/src/main/res/values-pt-rBR/strings.xml b/core/i18n/src/main/res/values-pt-rBR/strings.xml
index 3a50c2b7..8c95cfe8 100644
--- a/core/i18n/src/main/res/values-pt-rBR/strings.xml
+++ b/core/i18n/src/main/res/values-pt-rBR/strings.xml
@@ -126,7 +126,7 @@
     <string name="preference_category_links">Links</string>
     <string name="preference_version">Versão</string>
     <string name="preference_category_licenses">Licenças open-source</string>
-    <string name="preference_category_debug">Debug</string>
+    <string name="preference_category_debug">Depuração</string>
     <string name="preference_imperial_units">Unidades imperiais</string>
     <string name="preference_icon_shape_platform">Padrão do sistema</string>
     <string name="owncloud_login_2fa_hint">Se a autenticação em dois passos estiver ativada, você deverá usar um aplicativo de senha aqui.</string>
@@ -168,7 +168,7 @@
     <string name="preference_crash_reporter">Reportar falha</string>
     <string name="preference_export_log">Exportar arquivo log</string>
     <string name="preference_screen_search">Pesquisar</string>
-    <string name="preference_screen_search_summary">Configurar mecanismo de pesquisa</string>
+    <string name="preference_screen_search_summary">Configurar mecanismos de pesquisa</string>
     <string name="preference_search_favorites">Favoritos</string>
     <string name="preference_search_files">Arquivos</string>
     <string name="preference_search_contacts">Contatos</string>
@@ -208,7 +208,7 @@
     <string name="preference_dim_wallpaper">Escurecer papel de parede</string>
     <string name="preference_wallpaper_summary">Escolher o papel de parede</string>
     <string name="preference_screen_badges">Selos</string>
-    <string name="preference_screen_badges_summary">Configura os selos dos ícones</string>
+    <string name="preference_screen_badges_summary">Configurar os selos dos ícones</string>
     <string name="preference_notification_badges">Selos de notificação</string>
     <string name="preference_category_services_microsoft">Microsoft</string>
     <string name="preference_category_wallpaper">Papel de parede</string>
@@ -260,7 +260,7 @@
     <string name="weather_condition_heavysnowshowersandthunder">Neve intensa e trovões</string>
     <string name="weather_condition_lightsleetshowers">Neve molhada pouco intensa</string>
     <string name="weather_condition_snowshowersandthunder">Neve e trovões</string>
-    <string name="preference_screen_about_summary">Informação sobre o aplicativo e licenças</string>
+    <string name="preference_screen_about_summary">Informações sobre o aplicativo e licenças</string>
     <string name="preference_screen_appearance_summary">Personalizar a aparência</string>
     <string name="preference_weather_provider">Provedor</string>
     <string name="provider_brightsky">Deutscher Wetterdienst (Germany only)</string>
@@ -296,7 +296,7 @@
     <string name="preference_about_license_summary">Licenciado sob a GNU General Public License 3.0</string>
     <string name="preference_category_grid">Grade</string>
     <string name="preference_grid_column_count">Número de colunas</string>
-    <string name="preference_screen_debug">Debug</string>
+    <string name="preference_screen_debug">Depuração</string>
     <string name="preference_screen_debug_summary">Ferramentas de solução de problemas</string>
     <string name="preference_screen_widgets">Widgets</string>
     <string name="preference_screen_widgets_summary">Configurar widgets</string>
@@ -319,7 +319,7 @@
     <string name="preference_custom_colors_a1">Primária</string>
     <string name="preference_custom_colors_a3">Terciária</string>
     <string name="preference_category_custom_colors_light">Esquema de cores claras</string>
-    <string name="duplicate">Duplicado</string>
+    <string name="duplicate">Duplicar</string>
     <string name="action_next">Próximo</string>
     <string name="msg_item_hidden">%1$s foi ocultado.</string>
     <string name="action_undo">Desfazer</string>
@@ -329,7 +329,7 @@
     <string name="preference_custom_colors_simple_mode">Modo simples</string>
     <string name="preference_colors_auto_generate">Gerar a partir da cor primária</string>
     <string name="preference_category_custom_colors_dark">Esquema de cores escuras</string>
-    <string name="menu_customize">Customizar</string>
+    <string name="menu_customize">Personalizar</string>
     <string name="edit_favorites_dialog_new_tag">Criar etiqueta…</string>
     <string name="missing_permission_calendar_search_settings">A permissão de calendário é necessária para pesquisar o calendário</string>
     <string name="missing_permission_file_search_settings">Permissão de armazenamento externo é necessária para pesquisar arquivos locais</string>
@@ -343,7 +343,7 @@
     <string name="weather_location_search_no_result">Localização não encontrada.</string>
     <string name="missing_permission_calendar_widget">Conceda permissão de calendário para exibir compromissos e eventos futuros aqui.</string>
     <string name="preference_font">Fonte</string>
-    <string name="preference_font_system">Fonte padrão do sistema, depende da fabricante (Google Sans nos smartphonez Google Pixel, Roboto no AOSP)</string>
+    <string name="preference_font_system">Fonte padrão do sistema, depende da fabricante (Google Sans nos smartphones Google Pixel, Roboto no AOSP)</string>
     <string name="alert_delete_shortcut">O atalho %1$s vai ser removido permanentemente. Continuar\?</string>
     <string name="menu_remove">Remover</string>
     <string name="save">Salvar</string>
@@ -450,7 +450,7 @@
     <string name="preference_icon_shape_pebble">Seixo</string>
     <string name="preference_category_debug_tools">Ferramentas</string>
     <string name="preference_debug_cleanup_database">Limpar banco de dados</string>
-    <string name="preference_debug_cleanup_database_summary">Remova entradas quebradas e não utilizadas do banco de dados do iniciador</string>
+    <string name="preference_debug_cleanup_database_summary">Remove entradas quebradas e não utilizadas do banco de dados do iniciador</string>
     <string name="preference_cards_corner_radius">Raio de canto</string>
     <string name="preference_cards_stroke_width">Largura do traçado</string>
     <string name="preference_blur_wallpaper">Desfocar papel de parede</string>
@@ -580,4 +580,12 @@
     <string name="gesture_action_none">Nenhum</string>
     <string name="gesture_action_open_search">Abrir a pesquisa</string>
     <string name="gesture_action_notifications">Descer a barra de notificaçōes</string>
+    <string name="preference_search_result_ordering">Ordem dos resultados da pesquisa</string>
+    <string name="preference_search_result_ordering_alphabetic">Alfabética</string>
+    <string name="preference_search_result_ordering_launch_count">Quantidade de vezes aberto</string>
+    <string name="preference_search_result_ordering_weight_factor_low">Estável</string>
+    <string name="preference_search_result_ordering_weight_factor_high">Variável</string>
+    <string name="preference_search_result_ordering_weighted">Uso</string>
+    <string name="preference_search_result_ordering_weight_factor">Flexibilidade da classificação</string>
+    <string name="preference_search_result_ordering_weight_factor_default">Balanceada</string>
 </resources>
\ No newline at end of file
diff --git a/core/i18n/src/main/res/values-zh-rTW/strings.xml b/core/i18n/src/main/res/values-zh-rTW/strings.xml
index ec7d8def..fde82b75 100644
--- a/core/i18n/src/main/res/values-zh-rTW/strings.xml
+++ b/core/i18n/src/main/res/values-zh-rTW/strings.xml
@@ -572,4 +572,12 @@
     </plurals>
     <string name="gesture_action_launch_app">啟動應用程式</string>
     <string name="icon_picker_filter_all_packs">所有圖示包</string>
+    <string name="preference_search_result_ordering">搜尋結果排序</string>
+    <string name="preference_search_result_ordering_alphabetic">字母順序</string>
+    <string name="preference_search_result_ordering_launch_count">啟動次數</string>
+    <string name="preference_search_result_ordering_weighted">依使用率排序</string>
+    <string name="preference_search_result_ordering_weight_factor">排名靈活性</string>
+    <string name="preference_search_result_ordering_weight_factor_low">穩定</string>
+    <string name="preference_search_result_ordering_weight_factor_default">平衡</string>
+    <string name="preference_search_result_ordering_weight_factor_high">變數</string>
 </resources>
\ No newline at end of file
diff --git a/core/i18n/src/main/res/values-zh-rTW/units.xml b/core/i18n/src/main/res/values-zh-rTW/units.xml
index 033b522a..b080b84d 100644
--- a/core/i18n/src/main/res/values-zh-rTW/units.xml
+++ b/core/i18n/src/main/res/values-zh-rTW/units.xml
@@ -9,4 +9,131 @@
         <item quantity="other">公里</item>
     </plurals>
     <string name="unit_centimeter_symbol">公分</string>
+    <plurals name="unit_sqyard">
+        <item quantity="other">平方碼</item>
+    </plurals>
+    <plurals name="unit_acre">
+        <item quantity="other">英畝</item>
+    </plurals>
+    <plurals name="unit_kilobyte">
+        <item quantity="other">千位元組</item>
+    </plurals>
+    <plurals name="unit_centimeter">
+        <item quantity="other">公分</item>
+    </plurals>
+    <plurals name="unit_millimeter">
+        <item quantity="other">毫米</item>
+    </plurals>
+    <plurals name="unit_inch">
+        <item quantity="other">英寸</item>
+    </plurals>
+    <string name="unit_foot_symbol">ft</string>
+    <plurals name="unit_foot">
+        <item quantity="other">英尺</item>
+    </plurals>
+    <string name="unit_inch_symbol">in</string>
+    <string name="unit_millimeter_symbol">mm</string>
+    <string name="unit_yard_symbol">yd</string>
+    <plurals name="unit_yard">
+        <item quantity="other">碼</item>
+    </plurals>
+    <string name="unit_mile_symbol">mi</string>
+    <plurals name="unit_mile">
+        <item quantity="other">英里</item>
+    </plurals>
+    <string name="unit_nautic_mile_symbol">NM</string>
+    <plurals name="unit_nautic_mile">
+        <item quantity="other">海哩</item>
+    </plurals>
+    <string name="unit_sqmeter_symbol">m²</string>
+    <plurals name="unit_sqmeter">
+        <item quantity="other">平方公尺</item>
+    </plurals>
+    <string name="unit_sqkilometer_symbol">km²</string>
+    <plurals name="unit_sqkilometer">
+        <item quantity="other">平方公里</item>
+    </plurals>
+    <string name="unit_sqcentimeter_symbol">cm²</string>
+    <plurals name="unit_sqcentimeter">
+        <item quantity="other">平方公分</item>
+    </plurals>
+    <string name="unit_sqmillimeter_symbol">mm²</string>
+    <plurals name="unit_sqmillimeter">
+        <item quantity="other">平方公分</item>
+    </plurals>
+    <string name="unit_sqinch_symbol">in²</string>
+    <plurals name="unit_sqinch">
+        <item quantity="other">平方英吋</item>
+    </plurals>
+    <string name="unit_sqfoot_symbol">ft²</string>
+    <plurals name="unit_sqfoot">
+        <item quantity="other">平方英尺</item>
+    </plurals>
+    <string name="unit_sqyard_symbol">yd²</string>
+    <string name="unit_hectare_symbol">ha</string>
+    <plurals name="unit_hectare">
+        <item quantity="other">公頃</item>
+    </plurals>
+    <string name="unit_acre_symbol">ac</string>
+    <string name="unit_second_symbol">s</string>
+    <plurals name="unit_second">
+        <item quantity="other">秒</item>
+    </plurals>
+    <string name="unit_millisecond_symbol">ms</string>
+    <plurals name="unit_millisecond">
+        <item quantity="other">微秒</item>
+    </plurals>
+    <string name="unit_minute_symbol">min</string>
+    <plurals name="unit_minute">
+        <item quantity="other">分鐘</item>
+    </plurals>
+    <string name="unit_hour_symbol">h</string>
+    <plurals name="unit_hour">
+        <item quantity="other">小時</item>
+    </plurals>
+    <string name="unit_day_symbol">d</string>
+    <plurals name="unit_day">
+        <item quantity="other">天</item>
+    </plurals>
+    <string name="unit_year_symbol">a</string>
+    <plurals name="unit_year">
+        <item quantity="other">年</item>
+    </plurals>
+    <string name="unit_byte_symbol">B</string>
+    <plurals name="unit_byte">
+        <item quantity="other">位元組</item>
+    </plurals>
+    <string name="unit_kilobyte_symbol">kB</string>
+    <string name="unit_megabyte_symbol">MB</string>
+    <plurals name="unit_megabyte">
+        <item quantity="other">兆位元組</item>
+    </plurals>
+    <string name="unit_gigabyte_symbol">GB</string>
+    <plurals name="unit_gigabyte">
+        <item quantity="other">吉位元組</item>
+    </plurals>
+    <string name="unit_terabyte_symbol">TB</string>
+    <plurals name="unit_terabyte">
+        <item quantity="other">兆位元組</item>
+    </plurals>
+    <string name="unit_kibibyte_symbol">kiB</string>
+    <plurals name="unit_kibibyte">
+        <item quantity="other">基比位元組</item>
+    </plurals>
+    <string name="unit_mebibyte_symbol">MiB</string>
+    <plurals name="unit_mebibyte">
+        <item quantity="other">百萬位元組</item>
+    </plurals>
+    <string name="unit_gibibyte_symbol">GiB</string>
+    <plurals name="unit_gibibyte">
+        <item quantity="other">吉比位元組</item>
+    </plurals>
+    <string name="unit_tebibyte_symbol">TiB</string>
+    <plurals name="unit_tebibyte">
+        <item quantity="other">特比位元組</item>
+    </plurals>
+    <string name="unit_bit_symbol">bit</string>
+    <plurals name="unit_bit">
+        <item quantity="other">位元</item>
+    </plurals>
 </resources>
\ No newline at end of file