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 48a26f5db..5b48ed795 100644
--- a/core/i18n/src/main/res/values-zh-rTW/strings.xml
+++ b/core/i18n/src/main/res/values-zh-rTW/strings.xml
@@ -35,13 +35,13 @@
     <string name="menu_back">返回</string>
     <string name="menu_app_info">應用程式資訊</string>
     <string name="menu_launch">啟動</string>
-    <string name="menu_customize">自訂</string>
+    <string name="menu_customize">自定義</string>
     <string name="menu_open_file">開啟</string>
     <string name="menu_share">分享</string>
-    <string name="menu_share_store_link">連結 %1$s</string>
-    <string name="menu_share_apk_file">套件檔案</string>
-    <string name="menu_uninstall">解除安裝</string>
-    <string name="action_undo">復原動作</string>
+    <string name="menu_share_store_link">在 %1$s 中打開</string>
+    <string name="menu_share_apk_file">APK安裝包</string>
+    <string name="menu_uninstall">卸載</string>
+    <string name="action_undo">撤銷</string>
     <string name="menu_delete">刪除</string>
     <string name="menu_remove">移除</string>
     <string name="menu_contacts_open_externally">在「聯絡人」應用程式中開啟</string>
@@ -87,7 +87,7 @@
     <string name="file_type_source_code">原始碼檔案</string>
     <string name="file_type_document">文件</string>
     <string name="file_type_spreadsheet">電子表格</string>
-    <string name="file_type_music">音樂檔案</string>
+    <string name="file_type_music">音頻檔案</string>
     <string name="file_type_video">影片</string>
     <string name="file_type_image">圖片</string>
     <string name="file_type_none">檔案</string>
@@ -118,7 +118,7 @@
     <string name="menu_edit_widgets">編輯小工具</string>
     <string name="widget_name_weather">天氣</string>
     <string name="widget_name_calendar">日曆</string>
-    <string name="widget_name_music">音樂</string>
+    <string name="widget_name_music">多媒體</string>
     <string name="widget_name_favorites">我的最愛</string>
     <string name="widget_add_widget">新增小工具</string>
     <string name="shortcut_summary">由 %1$s</string>
@@ -136,7 +136,7 @@
     <string name="edit_favorites_dialog_empty_section">拖動項目到此</string>
     <string name="edit_favorites_dialog_tags">標籤</string>
     <string name="edit_favorites_dialog_tag_section_empty">被釘選的標籤將出現在這裡</string>
-    <string name="edit_favorites_dialog_new_tag">建立標籤…</string>
+    <string name="edit_favorites_dialog_new_tag">建立標籤</string>
     <string name="nextcloud_server_url">Nextcloud 伺服器 URL</string>
     <string name="nextcloud_server_invalid_url">此 URL 不能指向一個有效的 Nextcloud 安裝器</string>
     <string name="owncloud_server_url">Owncloud 伺服器 URL</string>
@@ -199,9 +199,9 @@
     <string name="weather_condition_heavyrainandthunder">重度雷雨</string>
     <string name="weather_condition_wind">颳風</string>
     <string name="weather_condition_unknown">未知</string>
-    <string name="weather_no_data">無可用的天氣資料。</string>
+    <string name="weather_no_data">無可用的天氣資料</string>
     <string name="weather_widget_set_location">設定位置</string>
-    <string name="weather_location_search_no_result">沒有找到位置。</string>
+    <string name="weather_location_search_no_result">沒有找到位置</string>
     <string name="missing_permission_auto_location">需要位置存取權以便自動確定位置</string>
     <string name="missing_permission_music_widget">需要通知存取權以便控制媒體播放</string>
     <string name="missing_permission_contact_search_settings">需要聯絡人許可權以便搜尋聯絡人</string>
@@ -507,18 +507,18 @@
     <string name="note_widget_conflict_file_version">現行檔案內容：</string>
     <string name="note_widget_file_read_error">讀取註記時發生錯誤</string>
     <string name="widget_name_notes">註記</string>
-    <string name="notes_widget_placeholder">寫一個註記…</string>
+    <string name="notes_widget_placeholder">寫一個註記</string>
     <string name="notes_widget_action_new">新的註記</string>
     <string name="notes_widget_action_save">儲存</string>
     <string name="notes_widget_export_filename">Note_%1$s</string>
     <string name="notes_widget_action_dismiss">解除</string>
-    <string name="notes_widget_dismissed">註記已被關閉。</string>
+    <string name="notes_widget_dismissed">註記已被關閉</string>
     <string name="widget_action_replace">替換</string>
     <string name="preference_screen_clockwidget_summary">配置時鐘樣式與組件</string>
     <string name="widget_name_unknown">未知的應用程式小工具</string>
     <string name="preference_custom_colors_corepalette">調色盤</string>
     <string name="customize_item_tags">標籤</string>
-    <string name="location_closes">關閉於 %1$s</string>
+    <string name="location_closes">將在 %1$s 打烊</string>
     <string name="import_theme_apply">應用主題</string>
     <string name="file_type_launchertheme">%1$s 主題</string>
     <string name="preference_search_locations">地點</string>
@@ -590,8 +590,8 @@
     <string name="action_clear">清除</string>
     <string name="action_done">完成</string>
     <string name="action_more_actions">更多動作</string>
-    <string name="location_open">開啟</string>
-    <string name="location_closed">關閉</string>
+    <string name="location_open">營業中</string>
+    <string name="location_closed">已打烊</string>
     <string name="menu_map">在地圖上檢視</string>
     <string name="menu_website">開啟網站</string>
     <string name="preference_category_animations">動畫</string>
@@ -625,9 +625,9 @@
     <string name="preference_search_location_custom_tile_server_url">Tileserver URL</string>
     <string name="plugin_type_locationsearch">地點搜尋</string>
     <string name="plugin_type_calendar">日曆</string>
-    <string name="location_closes_other_day">關閉於 %1$s, %2$s</string>
-    <string name="location_opens">開起於 %1$s</string>
-    <string name="location_opens_other_day">開起於 %1$s, %2$s</string>
+    <string name="location_closes_other_day">將在 %1$s, %2$s 打烊</string>
+    <string name="location_opens">將在 %1$s 開始營業</string>
+    <string name="location_opens_other_day">將在 %1$s, %2$s 開始營業</string>
     <string name="action_import">匯入</string>
     <string name="profile_work_profile_action_unlock">解除暫停</string>
     <string name="profile_work_profile_state_locked">工作應用程式被暫停。</string>
@@ -846,4 +846,23 @@
     <string name="preference_search_bar_style_transparent">透明</string>
     <string name="clock_variant_analog_ticks">時鐘標記</string>
     <string name="music_widget_interactive_progress_bar">互動式播放器進度條</string>
+    <string name="preference_clock_widget_monospaced">等寬字形</string>
+    <string name="preference_clockwidget_dock_rows">固定欄</string>
+    <string name="preference_search_apps">應用程式</string>
+    <string name="preference_search_apps_summary">當搜索框為空時顯示所有應用程式</string>
+    <string name="poi_category_stationery">文具店</string>
+    <string name="poi_category_climbing_gym">攀岩健身房</string>
+    <string name="poi_category_hackerspace">創意工坊</string>
+    <string name="preference_screen_locale">語言與地區</string>
+    <string name="preference_screen_locale_summary">語言，單位，時間單位</string>
+    <string name="preference_language">語言</string>
+    <string name="preference_value_system_default">系統默認</string>
+    <string name="preference_form_of_address">地址格式</string>
+    <string name="preference_form_of_address_neutral">地址格式</string>
+    <string name="preference_measurement_system">度量衡系統</string>
+    <string name="preference_measurement_system_metric">公制</string>
+    <string name="preference_measurement_system_uk">英制單位</string>
+    <string name="preference_measurement_system_us">美制單位</string>
+    <string name="preference_form_of_address_fem">地址格式</string>
+    <string name="preference_form_of_address_masc">地址格式</string>
 </resources>
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 c2b2be5a9..f96b36eaf 100644
--- a/core/i18n/src/main/res/values-zh-rTW/units.xml
+++ b/core/i18n/src/main/res/values-zh-rTW/units.xml
@@ -41,7 +41,7 @@
     <plurals name="unit_mile">
         <item quantity="other">英里</item>
     </plurals>
-    <string name="unit_nautic_mile_symbol">NM</string>
+    <string name="unit_nautic_mile_symbol">海里</string>
     <plurals name="unit_nautic_mile">
         <item quantity="other">海哩</item>
     </plurals>
@@ -49,11 +49,11 @@
     <plurals name="unit_sqmeter">
         <item quantity="other">平方公尺</item>
     </plurals>
-    <string name="unit_sqkilometer_symbol">km²</string>
+    <string name="unit_sqkilometer_symbol">平方公里</string>
     <plurals name="unit_sqkilometer">
         <item quantity="other">平方公里</item>
     </plurals>
-    <string name="unit_sqcentimeter_symbol">cm²</string>
+    <string name="unit_sqcentimeter_symbol">平方釐米</string>
     <plurals name="unit_sqcentimeter">
         <item quantity="other">平方公分</item>
     </plurals>
@@ -61,15 +61,15 @@
     <plurals name="unit_sqmillimeter">
         <item quantity="other">平方公分</item>
     </plurals>
-    <string name="unit_sqinch_symbol">in²</string>
+    <string name="unit_sqinch_symbol">平方英寸</string>
     <plurals name="unit_sqinch">
         <item quantity="other">平方英吋</item>
     </plurals>
-    <string name="unit_sqfoot_symbol">ft²</string>
+    <string name="unit_sqfoot_symbol">平方英尺</string>
     <plurals name="unit_sqfoot">
         <item quantity="other">平方英尺</item>
     </plurals>
-    <string name="unit_sqyard_symbol">yd²</string>
+    <string name="unit_sqyard_symbol">平方碼</string>
     <string name="unit_hectare_symbol">ha</string>
     <plurals name="unit_hectare">
         <item quantity="other">公頃</item>
@@ -130,7 +130,7 @@
     </plurals>
     <string name="unit_tebibyte_symbol">TiB</string>
     <plurals name="unit_tebibyte">
-        <item quantity="other">特比位元組</item>
+        <item quantity="other">兆位元</item>
     </plurals>
     <string name="unit_bit_symbol">bit</string>
     <plurals name="unit_bit">
@@ -146,11 +146,11 @@
     </plurals>
     <string name="unit_gigabit_symbol">Gbit</string>
     <plurals name="unit_gigabit">
-        <item quantity="other">吉比特</item>
+        <item quantity="other">吉位元</item>
     </plurals>
-    <string name="unit_terabit_symbol">Tbit</string>
+    <string name="unit_terabit_symbol">兆位元</string>
     <plurals name="unit_terabit">
-        <item quantity="other">太比特</item>
+        <item quantity="other">太位元</item>
     </plurals>
     <string name="unit_meter_per_second_symbol">m/s</string>
     <plurals name="unit_meter_per_second">
@@ -180,23 +180,23 @@
     <plurals name="unit_metric_ton">
         <item quantity="other">公噸</item>
     </plurals>
-    <string name="unit_long_ton_symbol">tn.l.</string>
+    <string name="unit_long_ton_symbol">英制噸</string>
     <plurals name="unit_long_ton">
         <item quantity="other">英噸</item>
     </plurals>
-    <string name="unit_stone_symbol">st.</string>
+    <string name="unit_stone_symbol">英石</string>
     <plurals name="unit_stone">
         <item quantity="other">英石</item>
     </plurals>
-    <string name="unit_pound_symbol">lb.</string>
+    <string name="unit_pound_symbol">磅</string>
     <plurals name="unit_pound">
         <item quantity="other">磅</item>
     </plurals>
-    <string name="unit_ounce_symbol">oz.</string>
+    <string name="unit_ounce_symbol">盎司</string>
     <plurals name="unit_ounce">
         <item quantity="other">盎司</item>
     </plurals>
-    <string name="unit_short_ton_symbol">tn.sh.</string>
+    <string name="unit_short_ton_symbol">美制吨</string>
     <plurals name="unit_short_ton">
         <item quantity="other">短噸</item>
     </plurals>
@@ -229,4 +229,72 @@
     <string name="dimension_frequency">頻率</string>
     <string name="dimension_temperature">溫度</string>
     <string name="dimension_time">時間</string>
-</resources>
\ No newline at end of file
+    <string name="unit_liter_symbol">公升</string>
+    <plurals name="unit_liter">
+        <item quantity="other">公升</item>
+    </plurals>
+    <string name="unit_milliliter_symbol">毫升</string>
+    <plurals name="unit_milliliter">
+        <item quantity="other">毫升</item>
+    </plurals>
+    <string name="unit_cubic_meter_symbol">立方米</string>
+    <plurals name="unit_cubic_meter">
+        <item quantity="other">立方米</item>
+    </plurals>
+    <string name="unit_cubic_centimeter_symbol">立方釐米</string>
+    <plurals name="unit_cubic_centimeter">
+        <item quantity="other">立方釐米</item>
+    </plurals>
+    <string name="unit_cubic_millimeter_symbol">立方毫米</string>
+    <plurals name="unit_cubic_millimeter">
+        <item quantity="other">立方毫米</item>
+    </plurals>
+    <string name="unit_cubic_inch_symbol">立方英寸</string>
+    <plurals name="unit_cubic_inch">
+        <item quantity="other">立方英寸</item>
+    </plurals>
+    <string name="unit_cubic_foot_symbol">立方英尺</string>
+    <plurals name="unit_cubic_foot">
+        <item quantity="other">立方英尺</item>
+    </plurals>
+    <string name="unit_cubic_yard_symbol">立方碼</string>
+    <plurals name="unit_cubic_yard">
+        <item quantity="other">立方碼</item>
+    </plurals>
+    <string name="unit_gallon_us_symbol">加侖</string>
+    <plurals name="unit_gallon_us">
+        <item quantity="other">加侖</item>
+    </plurals>
+    <string name="unit_gallon_imp_symbol">英制加侖</string>
+    <plurals name="unit_gallon_imp">
+        <item quantity="other">英制加侖</item>
+    </plurals>
+    <string name="unit_pint_us_symbol">品脫</string>
+    <plurals name="unit_pint_us">
+        <item quantity="other">品脫</item>
+    </plurals>
+    <string name="unit_pint_imp_symbol">英制品脫</string>
+    <plurals name="unit_pint_imp">
+        <item quantity="other">英制品脫</item>
+    </plurals>
+    <string name="unit_fluid_ounce_us_symbol">液量盎司</string>
+    <plurals name="unit_fluid_ounce_us">
+        <item quantity="other">液量盎司</item>
+    </plurals>
+    <string name="unit_fluid_ounce_imp_symbol">英制液量盎司</string>
+    <plurals name="unit_fluid_ounce_imp">
+        <item quantity="other">英制液量盎司</item>
+    </plurals>
+    <string name="unit_cup_symbol">杯</string>
+    <plurals name="unit_cup">
+        <item quantity="other">杯</item>
+    </plurals>
+    <string name="unit_tablespoon_symbol">餐匙</string>
+    <plurals name="unit_tablespoon">
+        <item quantity="other">餐匙</item>
+    </plurals>
+    <string name="unit_teaspoon_symbol">茶匙</string>
+    <plurals name="unit_teaspoon">
+        <item quantity="other">茶匙</item>
+    </plurals>
+</resources>