Import revised translations.

Change-Id: Ib13eef88a2489cc34caaa727680334f18489a3dc

2 files changed, 27 insertions, 52 deletions

diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index b381706..b8d757a 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -39,24 +39,8 @@
     <item msgid="4460915688877708508">"顯示部分視窗動畫"</item>
     <item msgid="488968798204105119">"顯示所有視窗動畫"</item>
   </string-array>
-  <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 秒"</item>
-    <item msgid="8881760709354815449">"30 秒"</item>
-    <item msgid="7589406073232279088">"1 分鐘"</item>
-    <item msgid="7001195990902244174">"2 分鐘"</item>
-    <item msgid="5721688686241190620">"10 分鐘"</item>
-    <item msgid="7156442995039264948">"30 分鐘"</item>
-  </string-array>
-  <string-array name="lock_after_timeout_entries">
-    <item msgid="5416834369150305288">"立即"</item>
-    <item msgid="6736512735606834431">"5 秒"</item>
-    <item msgid="8044619388267891375">"15 秒"</item>
-    <item msgid="1822002388249545488">"30 秒"</item>
-    <item msgid="8538071621211916519">"1 分鐘"</item>
-    <item msgid="5663439580228932882">"2 分鐘"</item>
-    <item msgid="7505084444184116101">"10 分鐘"</item>
-    <item msgid="4621683909972069205">"30 分鐘"</item>
-  </string-array>
+    <!-- no translation found for screen_timeout_entries:6 (6864027152847611413) -->
+    <!-- no translation found for lock_after_timeout_entries:8 (4322676235684793329) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"非常慢"</item>
     <item msgid="2361722960903353554">"慢"</item>
@@ -125,9 +109,11 @@
     <item msgid="1549288661423279207">"插入時絕不"</item>
     <item msgid="1986753720941888596">"永不"</item>
   </string-array>
-    <!-- no translation found for wifi_frequency_band_entries:0 (624340809384223320) -->
-    <!-- no translation found for wifi_frequency_band_entries:1 (6670588712989942178) -->
-    <!-- no translation found for wifi_frequency_band_entries:2 (2715516524973207876) -->
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"自動"</item>
+    <item msgid="6670588712989942178">"僅限 5 GHz"</item>
+    <item msgid="2715516524973207876">"僅限 2.4 GHz"</item>
+  </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"使用時間"</item>
     <item msgid="1908750532762193304">"啟動計數"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f689794..3744be4 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -116,9 +116,11 @@
     <string name="device_picker" msgid="8721012448931226323">"藍牙裝置選取器"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"藍牙權限要求"</string>
     <!-- outdated translation 2342558978033892004 -->     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"手機上的某個應用程式要求開啟藍牙裝置，您想要允許要求嗎？"</string>
-    <!-- outdated translation 669870705606180872 -->     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"手機上的某個應用程式要求開啟藍牙裝置，這表示您的藍牙連線將開放 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒，讓其他裝置可在時間內搜尋到您的手機。您想要允許要求嗎？"</string>
+    <!-- no translation found for bluetooth_ask_discovery (5950965604673262829) -->
+    <skip />
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"手機上的某個應用程式要求開啟藍牙裝置，這表示您的藍牙連線將開放 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒，讓其他裝置可在時間內搜尋到您的手機。您想要允許要求嗎？"</string>
-    <!-- outdated translation 7220210326619399542 -->     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"手機上的某個應用程式要求開啟藍牙裝置，這表示您的藍牙連線將開放 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒，讓其他裝置可在時間內搜尋到您的手機。您想要允許要求嗎？"</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_discovery (5716077575971497298) -->
+    <skip />
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"手機上的某個應用程式要求開啟藍牙裝置，這表示您的藍牙連線將開放 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒，讓其他裝置可在時間內搜尋到您的手機。您想要允許要求嗎？"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"正在開啟藍牙..."</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期與時間設定"</string>
@@ -461,12 +463,9 @@
     <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Wi-Fi 休眠設定"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"指定何時要從 Wi-Fi 切換到行動數據"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="5103670439972135148">"休眠設定時發生問題。"</string>
-    <!-- no translation found for wifi_setting_frequency_band_title (7493768705046080060) -->
-    <skip />
-    <!-- no translation found for wifi_setting_frequency_band_summary (3250740757118009784) -->
-    <skip />
-    <!-- no translation found for wifi_setting_frequency_band_error (837281974489794378) -->
-    <skip />
+    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi 頻帶"</string>
+    <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"指定作業的頻率範圍"</string>
+    <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"設定頻帶時發生問題。"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC 位址"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP 位址"</string>
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP 設定"</string>
@@ -639,7 +638,7 @@
     <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"掛載 SD 卡"</string>
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"清除 USB 儲存裝置"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"清除 SD 卡"</string>
-    <!-- outdated translation 1504606546865152514 -->     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"清除手機內部 USB 儲存裝置的所有資料，例如音樂和相片。"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"清除內部 USB 儲存裝置中的所有資料，例如音樂和相片"</string>
     <!-- outdated translation 1504606546865152514 -->     <string name="sd_format_summary" product="default" msgid="212703692181793109">"清除手機內部 USB 儲存裝置的所有資料，例如音樂和相片。"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"無法取得資訊"</string>
     <string name="read_only" msgid="6702420168629076340">" (唯讀)"</string>
@@ -693,24 +692,16 @@
     <string name="master_clear_title" msgid="5907939616087039756">"重設為原廠設定"</string>
     <!-- outdated translation 4986154238001088492 -->     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"清除手機上所有資料"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"清除手機上所有資料"</string>
-    <!-- unknown placeholder TAG_B_0 in master_clear_desc -->
-    <skip />
-    <!-- no translation found for master_clear_desc (1305457209008369655) -->
-    <skip />
-    <!-- unknown placeholder TAG_B_0 in master_clear_desc -->
-    <skip />
-    <!-- no translation found for master_clear_desc (2950536633526374209) -->
-    <skip />
-    <!-- no translation found for master_clear_accounts (6412857499147999073) -->
-    <skip />
-    <!-- no translation found for master_clear_desc_erase_external_storage (4740866328425123395) -->
-    <skip />
+    <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包含："\n\n<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
+    <string name="master_clear_desc" product="default" msgid="2950536633526374209">"這會清除您手機"<b>"內部儲存裝置"</b>"中的所有資料，包含："\n\n<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"您目前已登入下列帳戶："\n</string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"USB 儲存裝置"</b>"。"</string>
     <!-- no translation found for master_clear_desc_erase_external_storage (7339100478676372901) -->
     <skip />
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"清除 USB 儲存裝置"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"清除 SD 卡"</string>
-    <!-- outdated translation 1657838142707381027 -->     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"清除手機內部 USB 儲存裝置的所有資料，例如音樂或相片。"</string>
-    <!-- outdated translation 1657838142707381027 -->     <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"清除手機內部 USB 儲存裝置的所有資料，例如音樂或相片。"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"清除內部 USB 儲存裝置中的所有資料，例如音樂或相片。"</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"清除 SD 卡中的所有資料，例如音樂或相片。"</string>
     <!-- outdated translation 7550632653343157971 -->     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"重設手機"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"重設手機"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"要清除所有個人資料及先前下載的應用程式嗎？這個動作無法復原！"</string>
@@ -718,8 +709,7 @@
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"畫出解鎖圖形"</string>
     <!-- outdated translation 8901714274312707918 -->     <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"請畫出解鎖圖形，以確認重設手機。"</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"因「系統清除」服務異常，未成功執行重設。"</string>
-    <!-- no translation found for master_clear_confirm_title (4845794266129586839) -->
-    <skip />
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"確認重設"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"清除 USB 儲存裝置"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"清除 SD 卡"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"清除 USB 儲存裝置中的所有資料"</string>
@@ -782,11 +772,9 @@
     <string name="assisted_gps" msgid="4649317129586736885">"使用輔助 GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"使用伺服器輔助 GPS (取消勾選即可降低網路使用量)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"使用伺服器輔助 GPS (取消勾選即可提升 GPS 效能)"</string>
-    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"使用我的位置"</string>
-    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
-    <skip />
-    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
-    <skip />
+    <string name="use_location_title" msgid="3214740644957841179">"將位置資訊用於 Google 搜尋"</string>
+    <string name="use_location_summary_disabled" msgid="1876901471649359806">"將位置資訊用於 Google 搜尋和其他 Google 服務"</string>
+    <string name="use_location_summary_enabled" msgid="984549156918597265">"系統已採用位置資訊來改善 Google 搜尋結果和其他 Google 服務"</string>
     <!-- outdated translation 1743378368185371685 -->     <string name="about_settings" product="tablet" msgid="593457295516533765">"關於手機"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"關於手機"</string>
     <!-- outdated translation 3302263393543848667 -->     <string name="about_settings_summary" msgid="3371517697156165959">"檢視法律資訊、手機狀態、軟體版本"</string>
@@ -803,7 +791,8 @@
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"載入中..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"安全資訊"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全資訊"</string>
-    <!-- outdated translation 3198912875259612887 -->     <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"您的手機尚未與資料傳輸服務連線。如要檢視此資訊，請使用任何可上網的電腦前往 %s。"</string>
+    <!-- no translation found for settings_safetylegal_activity_unreachable (170670055116721810) -->
+    <skip />
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"載入中..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"選擇密碼"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"選擇您的 PIN"</string>