Fix Build break, will address in parallel.

Revert "Import translations. DO NOT MERGE"

This reverts commit b2ceea95f29e383e512f916a66e03439f6cfcf54.

Change-Id: Ie92030c9c3bdde0b7dffd1382e2393126688ce4e

2 files changed, 129 insertions, 94 deletions

diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index de2e65f..2839ec9 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"無"</item>
     <item msgid="8673874894887358090">"手動"</item>
-    <item msgid="168893341855953140">"Proxy 自動設定"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"關閉"</item>
+    <item msgid="3165868966179561687">"警示"</item>
+    <item msgid="6038758039030476855">"震動"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"無"</item>
@@ -345,12 +349,11 @@
     <item msgid="9044232017390975191">"非常大"</item>
   </string-array>
   <string-array name="captioning_edge_type_selector_titles">
-    <item msgid="4733815704128258753">"預設"</item>
-    <item msgid="3217099060748617005">"無"</item>
-    <item msgid="7467615139904599420">"外框"</item>
-    <item msgid="5623165557468608975">"陰影"</item>
-    <item msgid="8088451174058214588">"外凸"</item>
-    <item msgid="3821418743395480313">"內凹"</item>
+    <item msgid="6022616153255438487">"無"</item>
+    <item msgid="1352974708028506778">"外框"</item>
+    <item msgid="5850876295428722675">"陰影"</item>
+    <item msgid="4620283365518546731">"浮凸"</item>
+    <item msgid="6395808180998856466">"內凹"</item>
   </string-array>
   <string-array name="captioning_opacity_selector_titles">
     <item msgid="7622491218136667566">"25%"</item>
@@ -359,12 +362,11 @@
     <item msgid="8342334626783983353">"100%"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">
-    <item msgid="7009918361545506251">"使用應用程式預設值"</item>
-    <item msgid="1770533843436933500">"黑底白字"</item>
-    <item msgid="758587126802411846">"白底黑字"</item>
-    <item msgid="1495307195241623402">"黑底黃字"</item>
-    <item msgid="6039700130994371612">"藍底黃字"</item>
-    <item msgid="7169235156349580064">"自訂"</item>
+    <item msgid="1630625150404038035">"黑底白字"</item>
+    <item msgid="4589278788192525675">"白底黑字"</item>
+    <item msgid="1309255027325660115">"黑底黃字"</item>
+    <item msgid="2985943780939258562">"藍底黃字"</item>
+    <item msgid="7520438652121629055">"自訂"</item>
   </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
@@ -437,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"關閉"</item>
     <item msgid="2751513398307949636">"在螢幕上以列顯示"</item>
-    <item msgid="1851438178120770973">"在「adb shell dumpsys gfxinfo」指令中"</item>
+    <item msgid="8272260411216018353">"在螢幕上以行顯示"</item>
+    <item msgid="120512413928262547">"在「In adb shell dumpsys gfxinfo」指令中"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"關閉"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d8babfd..f42686b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"您現在已成為開發人員！"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"不需要了，您已經是開發人員。"</string>
-    <string name="header_category_wireless_networks" msgid="7617195369015536614">"無線與網路"</string>
-    <string name="header_category_device" msgid="4544026001618307754">"裝置"</string>
-    <string name="header_category_personal" msgid="3310195187905720823">"個人"</string>
-    <string name="header_category_system" msgid="2816866961183068977">"系統"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"開啟無線通訊"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"關閉無線通訊"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"開啟 IMS 簡訊"</string>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"螢幕顯示時間："</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"不明"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"充電中"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"正在透過 AC 變壓器充電"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"正在透過 USB 充電"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"正在透過無線方式充電"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(無線)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"非充電中"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"非充電中"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"電力充足"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"若主機欄位空白，連接埠欄位也須空白。"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"您所輸入的通訊埠無效。"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"瀏覽器會使用 HTTP Proxy，但其他應用程式不一定會採用這項設定。"</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC 網址： "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC 網址： "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"位置："</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相鄰的客戶編號："</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"儲存格資訊："</string>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"設定"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"設定捷徑"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"飛航模式"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC 和其他設定"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"更多內容…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"無線與網路"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"管理 Wi-Fi、藍牙、飛航模式、行動網路和 VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"漫遊服務"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"擁有者資訊"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"啟用小工具"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"已由管理員停用"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC 解鎖"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"輸入要在鎖定畫面上顯示的文字"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"在鎖定畫面上顯示使用者資訊"</string>
@@ -324,7 +329,6 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"在鎖定畫面上顯示個人資料資訊"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"個人資料資訊"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"定位"</string>
-    <string name="account_settings_title" msgid="626177544686329806">"帳戶"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"安全性"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、解除鎖定畫面及鎖定認證儲存空間"</string>
@@ -333,8 +337,10 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"加密保護平板電腦"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"對手機進行加密"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"帳戶、設定、下載的應用程式及其資料、媒體和其他檔案皆可加密。將平板電腦加密後，系統會套用螢幕鎖定 (也就是設定解鎖圖形、數字 PIN 或密碼)，您必須在每次開機時解除螢幕鎖定，才能將平板電腦解密。除此之外，唯一的解密方法是將平板電腦恢復原廠設定，同時清除所有資料。\n\n加密程序可能需要一個多小時才能完成。開始執行加密程序前，電池必須充飽，而平板電腦在加密過程中必須全程連接電源。如果中斷程序，您將遺失部分或所有資料。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"帳戶、設定、下載的應用程式及其資料、媒體和其他檔案皆可加密。將手機加密後，系統會套用螢幕鎖定 (也就是設定解鎖圖形、數字 PIN 或密碼)，您必須在每次開機時解除螢幕鎖定，才能將手機解密。除此之外，唯一的解密方法是將手機恢復原廠設定，同時清除所有資料。\n\n加密程序可能需要一個多小時才能完成。開始執行加密程序前，電池必須充飽，而手機在加密過程中必須全程連接電源。如果中斷程序，您將遺失部分或所有資料。"</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"加密保護平板電腦"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"對手機進行加密"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"將電池充電，然後再試一次。"</string>
@@ -570,7 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"連線至網路"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"清除網路"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"修改網路"</string>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"寫入 NFC 標記"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"如要查看可用的網路，請開啟 Wi-Fi。"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"正在搜尋 Wi-Fi 網路…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"您沒有變更 Wi-Fi 網路的權限。"</string>
@@ -619,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (可使用 WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"透過 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 加密保護"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"，透過 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 加密保護"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"輸入您的網路密碼"</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"無"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> 要求開啟網路掃描功能 (即使 Wi-Fi 已關閉)，藉此提升定位精確度及用於其他用途。\n\n您要對所有需要執行掃描的應用程式允許這項要求嗎？"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允許"</string>
@@ -728,8 +736,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"將平板電腦置入座架或移出座架時，不要播放音效"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"手機插入底座或離開底座時，不要播放音效"</string>
     <string name="account_settings" msgid="6403589284618783461">"帳戶"</string>
-    <string name="category_personal" msgid="1299663247844969448">"個人"</string>
-    <string name="category_work" msgid="8699184680584175622">"公司"</string>
     <string name="search_settings" msgid="1910951467596035063">"搜尋"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"管理搜尋設定和記錄"</string>
     <string name="display_settings" msgid="7965901687241669598">"顯示"</string>
@@ -738,10 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"旋轉手機時自動改變顯示方向"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"旋轉平板電腦時自動切換瀏覽模式"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"旋轉手機時自動改變顯示方向"</string>
-    <string name="brightness" msgid="8480105032417444275">"亮度"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"調整螢幕亮度"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"自動調整亮度"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"根據環境光源調整最佳亮度"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"桌布"</string>
@@ -961,7 +970,7 @@
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"您必須畫出解鎖圖形以確認要清除 USB 儲存裝置的資料。"</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"請畫出解鎖圖形，確認您要清除 SD 卡中的資料。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
-    <string name="call_settings_summary" msgid="7291195704801002886">"設定語音信箱、來電轉接、來電待接及來電顯示"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"設定語音信箱、來電轉接、來電待接及本機號碼顯示"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 網路共用"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"可攜式無線基地台"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"藍牙網路共用"</string>
@@ -993,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"變更簡訊應用程式？"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"您要改用 <xliff:g id="NEW_APP">%1$s</xliff:g> 而不再使用 <xliff:g id="CURRENT_APP">%2$s</xliff:g> 做為簡訊應用程式嗎？"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"使用 <xliff:g id="NEW_APP">%s</xliff:g> 做為簡訊應用程式嗎？"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"未知的 SIM 卡行動通訊業者"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"未知的 SIM 行動通訊業者"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s 沒有任何已知的佈建網站"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"請插入 SIM 卡，並重新啟動裝置"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"請連線至網際網路"</string>
@@ -1325,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB 偵錯"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"連接 USB 時進入偵錯模式"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"撤銷 USB 偵錯授權"</string>
-    <string name="bugreport_in_power" msgid="7923901846375587241">"錯誤回報捷徑"</string>
-    <string name="bugreport_in_power_summary" msgid="1778455732762984579">"在電源選單中顯示取得錯誤報告的按鈕"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"保持清醒"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電時螢幕不會進入休眠"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"啟用藍牙 HCI 窺探紀錄"</string>
@@ -1335,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"選取執行階段"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"要重新啟動裝置，將執行階段從 <xliff:g id="OLD">%1$s</xliff:g> 變更為 <xliff:g id="NEW">%2$s</xliff:g> 嗎？"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"無線螢幕分享認證"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"啟用 Wi-Fi 詳細資訊記錄功能"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"顯示無線螢幕分享認證的選項"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"提升 Wi-Fi 記錄功能等級 (在 Wi-Fi 選擇工具中依 SSID RSSI 顯示)"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"允許 USB 偵錯嗎？"</string>
@@ -1428,7 +1437,6 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"字幕外觀如下"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"預設"</string>
-    <string name="color_unspecified" msgid="5179683785413568326">"預設"</string>
     <string name="color_none" msgid="3475640044925814795">"無"</string>
     <string name="color_white" msgid="8045195170201590239">"白色"</string>
     <string name="color_gray" msgid="9192312087142726313">"灰色"</string>
@@ -1483,11 +1491,7 @@
     <string name="power_discharging" msgid="6023874912674684056">"<xliff:g id="LEVEL">%1$d</xliff:g>%%"</string>
     <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%%：還剩大約 <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%%：<xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g>後充飽"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g>後充飽 (透過 AC 變壓器充電)"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g>後充飽 (透過 USB 充電)"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g>後充飽 (透過無線方式充電)"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"上次充飽後的使用情形"</string>
+    <string name="power_charging_duration" msgid="1076204146651267327">"<xliff:g id="LEVEL">%1$d</xliff:g>%%：<xliff:g id="STATE">%2$s</xliff:g> (<xliff:g id="TIME">%3$s</xliff:g>後充飽)"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔除插頭後的電池使用狀況"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"重設後的電池使用狀況"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"電池已使用時間：<xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1500,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"行動網路訊號"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"上午 <xliff:g id="TIME">%1$d</xliff:g>"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"下午 <xliff:g id="TIME">%1$d</xliff:g>"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"裝置清醒時間"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"開啟 Wi-Fi 的時間"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"開啟 Wi-Fi 的時間"</string>
@@ -1689,7 +1688,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"移除所有憑證"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"信任的憑證"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"顯示信任的 CA 憑證"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"進階"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"儲存空間類型"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"硬體備份"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"僅限軟體"</string>
@@ -1740,7 +1738,7 @@
     <string name="device_admin_status" msgid="4252975713178851910">"這個管理員正在作業中，且允許 <xliff:g id="APP_NAME">%1$s</xliff:g> 應用程式執行以下作業："</string>
     <string name="untitled_apn" msgid="1230060359198685513">"未命名"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"一般"</string>
-    <string name="notification_log_title" msgid="3766148588239398464">"通知紀錄"</string>
+    <string name="sound_category_notification_title" msgid="3502115998790286943">"通知"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"來電鈴聲與震動"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"系統"</string>
     <string name="wifi_setup_title" msgid="2970260757780025029">"Wi-Fi 設定"</string>
@@ -1773,7 +1771,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"輕觸 [下一步]"<b></b>" 即可繼續設定程序；\n\n輕觸 [返回]"<b></b>" 則可連線至其他 Wi-Fi 網路。"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"同步處理已啟用"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"同步處理已停用"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"目前正在同步處理"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"同步處理錯誤。"</string>
     <string name="sync_failed" msgid="1696499856374109647">"同步處理失敗"</string>
     <string name="sync_active" msgid="8476943765960863040">"同步處理已啟用"</string>
@@ -1820,8 +1817,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 位址"</string>
     <string name="enter_password" msgid="4131758584074246224">"輸入密碼即可為儲存裝置解密"</string>
-    <string name="enter_pin" msgid="286221169871526876">"輸入您的 PIN 即可解密儲存裝置"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"畫出您的圖形即可解密儲存裝置"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"請再試一次。"</string>
     <string name="delete" msgid="4219243412325163003">"刪除"</string>
     <string name="misc_files" msgid="6720680815969643497">"其他檔案"</string>
@@ -2109,6 +2108,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"拍攝相片"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"從圖片庫選擇相片"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC 螢幕鎖定設定"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"配對的標記"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"已啟用"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"與標記配對"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"立即配對"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"請將標記平放在桌上，然後將手機放在標記上"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"標記和手機已成功配對，大功告成！"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"無法使用您提供的標記為您的手機解鎖"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"與您的標記配對失敗，請再試一次"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC 解鎖功能需要使用 NFC，但 NFC 尚未啟用。請開啟 NFC。"</string>
+    <string name="ok" msgid="3651563352754792958">"NFC 設定"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"設定"</string>
     <string name="search_results_title" msgid="1796252422574886932">"設定"</string>
     <string name="search_menu" msgid="7053532283559077164">"搜尋"</string>
@@ -2116,7 +2127,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"最近的搜尋查詢"</string>
     <string name="search_results_label" msgid="4163304782363526148">"搜尋結果"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi 網路連線"</string>
-    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 Wi-Fi NFC 標記"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"輕按標記即可寫入..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"密碼無效，請再試一次。"</string>
@@ -2124,43 +2136,55 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"無法將資料寫入 NFC 標記。如果問題持續發生，請嘗試使用其他標記"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"無法寫入 NFC 標記，請使用其他標記。"</string>
     <string name="default_sound" msgid="8821684447333687810">"預設音效"</string>
-    <string name="notification_settings" msgid="4117833036535910061">"音效與通知"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"媒體音量"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"鬧鐘音量"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"鈴聲音量"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"通知音量"</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
     <string name="zen_mode_settings_title" msgid="2689740350895257590">"勿干擾"</string>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"來電和收到通知時"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"收到通知時"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"鈴響"</string>
-    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"以震動取代鈴響"</string>
-    <string name="ringer_mode_silent" msgid="4812605852723880795">"不發出鈴響或震動"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
     <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"預設通知鈴聲"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"鈴響時震動"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"顯示通知"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"閃爍燈光通知"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"裝置鎖定時"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"隱藏機密通知內容"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"完全不顯示通知"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"開啟請勿打擾模式時"</string>
-    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"在清單中隱藏新通知"</string>
-    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"在清單中顯示所有通知"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"應用程式通知"</string>
-    <string name="other_sound_settings" msgid="3151004537006844718">"其他音效"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"撥號鍵盤音效"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"螢幕鎖定音效"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"固定音效"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"觸控音效"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"觸控時震動"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"固定喇叭播放音效"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"所有音訊"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"僅限媒體音訊"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"靜音"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"警示"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"震動"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"通知存取權"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"應用程式無法讀取通知"</string>
   <plurals name="manage_notification_access_summary_nonzero">
     <item quantity="one" msgid="8344183614159211585">"%d 個應用程式可以讀取通知"</item>
@@ -2180,18 +2204,24 @@
     <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> 將可新增結束「請勿打擾」模式的條件。"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"顯示通知"</string>
-    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"顯示在清單頂端"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"裝置鎖定時隱藏機密內容"</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"已封鎖"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"清單頂端"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"機密"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"完成"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"手動關閉這項設定前一律啟用"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"封鎖所有干擾，但以下項目除外："</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"夜間"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"其他自動化設定"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"自動開啟"</string>
-    <string name="summary_divider_text" msgid="3087735442599707533">"、"</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"永遠不要"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"通話"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"訊息"</string>
@@ -2210,6 +2240,8 @@
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"應用程式通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"傳送您對這個裝置的意見回饋"</string>
-    <string name="switch_on_text" msgid="1124106706920572386">"開啟"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"關閉"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>