Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev

commit: b1ded62f3fd8afa2507fc8d284522019dc1e31e2 [log] [tgz]
author: David Christie <dnchrist@google.com> Thu Nov 14 20:12:41 2013 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Thu Nov 14 20:12:42 2013 +0000
tree: 6d8bf6a36f880db8df1f394577a6136731c8196e
parent: 9b28d5a0c3a6ac46a55a5c8c3b10791494fd61c5 [diff]
parent: 587e6bf3fcfc8dffb4cf021227d896ffcb5488a9 [diff]
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b730ba7..7c4be12 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml

@@ -1343,7 +1343,6 @@
         </activity>
 
         <activity android:name="Settings$WifiDisplaySettingsActivity"
-                android:uiOptions="splitActionBarWhenNarrow"
                 android:label="@string/wifi_display_settings_title"
                 android:taskAffinity=""
                 android:excludeFromRecents="true">

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 54ce7d3..e03499e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Die poortveld moet leeg wees as die gasheerveld leeg is."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Die poort wat jy ingevoer het, is nie geldig nie."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Die HTTP-instaanbediener word deur die blaaier gebruik, maar kan nie deur die ander programme gebruik word nie."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC-URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ligging:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naburige CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Selinligting:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As luidsprekerfoon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Vir musiek en media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Onthou instellings"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Draadlose skerm"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Skakel draadlose skerm aan on toestelle te sien."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Draadlose skerm is gedeaktiveer omdat Wi-Fi af is."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Soek na skerms"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Soek tans…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Geen nabygeleë draadlose skerms is gevind nie."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Saamgebinde skerms"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Beskikbare toestelle"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktiveer draadlose skermdeling"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Geen nabygeleë toestelle is gekry nie."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Koppel tans"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Gekoppel"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Beskikbaar"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In gebruik"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Onbeskikbaar"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Vertooninstellings"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Ontkoppel?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Dit sal jou verbinding met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; beëindig."</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Draadlose vertoonopsies"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Vergeet"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Klaar"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Naam"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Aan"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Af"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Gedeaktiveer"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Laat dataruiling toe wanneer die tablet aan \'n ander toestel raak"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Laat data-ruilprogram toe wanneer die foon aan \'n ander toestel raak"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Klaar"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Netwerkmonitering"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Hierdie toestel word bestuur deur:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nJou administrateur kan jou netwerkaktiwiteit monitor, insluitend e-posse, programme en veilige webtuistes.\n\nKontak jou administrateur vir meer inligting."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"\'n Derde party kan jou netwerk\n-aktiwiteit monitor, insluitend e-pos, programme en veilige webwerwe.\n\n\'n Vertroude eiebewys wat op jou toestel geïnstalleer is, maak dit moontlik."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"\'n Derde party kan jou netwerkaktiwiteit monitor, insluitend e-posse, programme en veilige webwerwe.\n\n\'n Vertroude eiebewys wat op jou toestel geïnstalleer is, maak dit moontlik."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Gaan vertroude eiebewyse na"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Gebruikers"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Gebruikers en profiele"</string>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 390eb60..fc7dfdb 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -199,6 +199,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 ተተኪ ተጠቅሟል ሆኖም በሌሎች መተግበሪያዎች ላይጠቀም ይችላል።"</string>
+    <string name="proxy_url" msgid="2523518669129974654">"ፒ ኤ ሲ ዩ አር ኤል፦ "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ስፍራ:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"አጎራባችCID፡"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo፦"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"እንደ ተናጋሪ ስልክ"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ለሙዚቃ እና ማህደረ መረጃ"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ቅንብሮች አስታውስ"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"ገመድ አልባ ማሳያ"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"መሣሪያዎችን ለማየት የገመድ አልባ ማሳያን ያብሩ።"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Wi-Fi ስለጠፋ የገመድ አልባ ማሳያ ተሰናክሏል።"</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"ማሳያዎችን ይፈልጉ"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"በመፈለግ ላይ…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"በአቅራቢያ ያሉ ምንም ገመድ አልባ ማሳያዎች አልተገኙም።"</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"የተጣመሩ ማሳያዎች"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"የሚገኙ መሣሪያዎች"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ገመድ-አልባ ማሳየትን ያንቁ"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"በአቅራቢያ ምንም መሳሪያዎች አልተገኙም።"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"በመገናኘት ላይ"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"ተገናኝቷል"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"የሚገኙ"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"በስራ ላይ ያሉ"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"አይገኝም"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"የማሳያ ቅንብሮች"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"ግንኙነቱ ይቋረጥ?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"ይሄ ከዚህ ጋር ያለዎትን ግንኙነት ያስቆመዋል፦&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"የገመድ አልባ ማሳያ አማራጮች"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"እርሳ"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"ተከናውኗል"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"ስም"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"በርቷል"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"ጠፍቷል"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"ተሰናክሏል"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"ጡባዊ ቱኮው ሌላ መሳሪያ ሲነካ የውሂብ ልውውጥ ፍቀድ"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"ስልኩ ሌላ መሳሪያ ሲነካ የውሂብ ልውውጥ ፍቀድ"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"ተከናውኗል"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"የአውታረ መረብ ክትትል"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"ይህን መሣሪያ የሚያቀናብረው፦\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nየእርስዎ አስተዳዳሪ ኢሜይሎች፣ መተግበሪያዎች እና ደህንነታቸው የተጠበቁ መሣሪያዎችን ጨምሮ የአውታረ መረብ እንቅስቃሴዎን የመከታተል ብቃት አለው።\n\nተጨማሪ መረጃ ለማግኘት አስተዳዳሪዎን ያግኙ።"</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"ሶስተኛ ወገን ኢሜይሎችዎን፣ መተግበሪያዎችዎን እና ደህንነታቸው አስተማማኝ የሆኑ ድር ጣቢያዎችን ጨምሮ አውታረ መረብ\nእንቅስቃሴዎን መከታተል ይችላል።\n\nበመሳሪያዎ ላይ የተጫነ የታመነ ምስክርነት ይህን የሚቻል አድርጎታል።"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"ሶስተኛ ወገን ኢሜይሎች፣ መተግበሪያዎች እና ደህንነታቸው የተጠበቁ ድር ጣቢያዎችም ጨምሮ የእርስዎን የአውታረ መረብ እንቅስቃሴ የመከታተል ችሎታ አለው።\n\nበእርስዎ መሣሪያ ላይ የተጫነ አንድ የሚታመን ምስክርነት ይሄ እንዲከሰት የሚቻል እያደረገ ነው።"</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"የታመኑ ምስክርነቶችን ፈትሽ"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"ተጠቃሚዎች"</string>
     <string name="user_list_title" msgid="7937158411137563543">"ተጠቃሚዎች እና መገለጫዎች"</string>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 6b0680d..a3f1583 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -199,6 +199,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، ولكنه ربما لا تستخدمه التطبيقات الأخرى."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"‏عنوان URL لتهيئة PAC "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"الموقع:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"‏تجاور CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"معلومات الخلية:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"كهاتف بسماعة خارجية"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"للموسيقى والوسائط"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"تذكّر الإعدادات"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"وحدة عرض لاسلكية"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"للاطلاع على الأجهزة، شغّل وحدة عرض لاسلكية."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"‏تم تعطيل وحدة عرض لاسلكية نظرًا لإيقاف تشغيل شبكة Wi-Fi."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"البحث عن وحدات عرض"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"جارٍ البحث..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"لم يتم العثور على وحدات عرض لاسلكية"</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"وحدات العرض المقترنة"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"الأجهزة المتاحة"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"تمكين عرض شاشة لاسلكي"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"لم يتم العثور على أجهزة بالجوار."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"جارٍ الاتصال"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"متصل"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"متاح"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"قيد الاستخدام"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"غير متاح"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"عرض الإعدادات"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"هل تريد قطع الاتصال؟"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"‏سيؤدي هذا إلى إنهاء الاتصال مع:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"خيارات وحدات العرض اللاسلكية"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"حذف"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"تم"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"الاسم"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"تشغيل"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"إيقاف"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"معطل"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"السماح بتبادل البيانات عندما يلمس الجهاز اللوحي جهازًا آخر"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"السماح بتبادل البيانات عندما يلمس الهاتف جهازًا آخر"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"تم"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"مراقبة الشبكات"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"هذا الجهاز يديره:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nيستطيع مشرفك مراقبة أنشطتك على الشبكة، بما في ذلك الرسائل الإلكترونية والتطبيقات ومواقع الويب الآمنة.\n\nللمزيد من المعلومات، اتصل بالمشرف."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"بإمكان الطرف الثالث مراقبة أنشطة\nالشبكة، بما في ذلك الرسائل الإلكترونية والتطبيقات ومواقع الويب الآمنة.\n\nوتجعل بيانات الاعتماد الموثوق فيها والمثبتة على جهازك حدوث هذا ممكنًا."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"يُمكن لأي جهة خارجية مراقبة نشاط الشبكة، بما في ذلك الرسائل الإلكترونية والتطبيقات ومواقع الويب الآمنة.\n\nويُمكن لبيانات اعتماد موثوقة ومثبتة على جهاز الكمبيوتر إتاحة إجراء ذلك."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"التحقق من بيانات الاعتماد الموثوق فيها"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"المستخدمون"</string>
     <string name="user_list_title" msgid="7937158411137563543">"المستخدمون والملفات الشخصية"</string>

diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index b92fc4a..5f88c7a 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -205,6 +205,8 @@
     <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 выкарыстоўваецца браўзэрам, але ён не можа выкарыстоўвацца іншымі прыкладаннямi"</string>
+    <!-- no translation found for proxy_url (2523518669129974654) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Месцазнаходжанне:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Суседнія CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Звесткi ячэйкi:"</string>
@@ -524,28 +526,22 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Як гучная сувязь"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Для музыкі і мультымедыя"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомніць налады"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Бесправадны дысплей"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Каб убачыць прылады, уключыце бесправадны дысплей."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Бесправадны дысплей адключаны, паколькі выключана Wi-Fi."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Пошук дысплеяў"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Пошук..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Паблiзу не знойдзены бесправадныя дысплеi."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Спалучаныя дысплеi"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Даступныя прылады"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <!-- no translation found for wifi_display_enable_menu_item (4883036464138167674) -->
+    <skip />
+    <!-- no translation found for wifi_display_no_devices_found (1382012407154143453) -->
+    <skip />
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Падключэнне"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Падключана"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Даступна"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Выкарыстоўваецца"</string>
+    <!-- no translation found for wifi_display_status_not_available (5714978725794210102) -->
+    <skip />
     <string name="wifi_display_details" msgid="7791118209992162698">"Налады экрана"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Адключыцца?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Будзе завершана вашай сувящь з прыладай :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Параметры бесправаднога дысплея"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Ігнараваць"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Гатова"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Назва"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Укл."</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Выкл."</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Выключана"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Дазволіць абмен дадзенымі, калі планшэт дакранаецца да іншай прылады"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Дазволіць абмен дадзенымі, калі тэлефон закранае іншыя прылады"</string>
@@ -2101,7 +2097,7 @@
     <skip />
     <!-- no translation found for ssl_ca_cert_info_message (4583879256548819713) -->
     <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <!-- no translation found for ssl_ca_cert_warning_message (8216218659139190498) -->
     <skip />
     <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
     <skip />

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 759792d..89ad610 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -199,6 +199,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 прокси сървърът се използва от браузъра, но не и от други приложения."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL адрес на 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>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Като високоговорител"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"За музика и медийни файлове"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомняне на настройки"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Безжичен дисплей"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"За да видите устройства, включете безжичния дисплей."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Безжичният дисплей е деактивиран, защото Wi‑Fi е изключен."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Търсене на дисплеи"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Търси се…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Няма намерени безжични дисплеи в района."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Сдвоени дисплеи"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Налични устройства"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Активиране на безжичния дисплей"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Няма намерени устройства в района."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Установява се връзка"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Установена е връзка"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Налице"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Използва се"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Не е налице"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Настройки за дисплея"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Да се изключи ли?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Това ще прекрати връзката ви със:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Опции на безжичния дисплей"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Забравяне"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Готово"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Име"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Вкл."</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Изкл."</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Деактивирано"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Разрешаване на обмен на данни, когато таблетът докосва друго устройство"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Разрешаване на обмен на данни, когато телефонът докосва друго устройство"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Готово"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Наблюдение на мрежата"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Това устройство се управлява от:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nАдминистраторът ви може да наблюдава активността ви в мрежата, включително имейлите, приложенията и защитените уебсайтове.\n\nЗа повече информация се свържете с него."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Трета страна може да наблюдава активността ви в\nмрежата, включително имейлите, приложенията и сигурните уебсайтове.\n\nТова е възможно благодарение на инсталирани на устройството ви надеждни идентификационни данни."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Трета страна може да наблюдава активността ви в мрежата, включително имейлите, приложенията и защитените уебсайтове.\n\nТова е възможно благодарение на инсталирани на устройството ви надеждни идентификационни данни."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Проверка на надеждните идентификационни данни"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Потребители"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Потребители и потребителски профили"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 991d4e1..a7ccf1b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El camp del port ha de ser buit si el camp de l\'amfitrió és buit."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"El port que has escrit no és vàlid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador utilitza un servidor intermediari HTTP, però pot ser que la resta d\'aplicacions no."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL de PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicació:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID veí:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informació mòbil:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Com a telèfon amb altaveu"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per a música i contingut multimèdia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recorda la configuració"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Pantalla sense fil"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Per veure els dispositius, activa la pantalla sense fil."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"La pantalla sense fil està desactivada perquè la Wi-Fi està desactivada."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Cerca pantalles"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"S\'està cercant…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"No s\'ha trobat cap pantalla sense fil a prop"</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Pantalles sincronitzades"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dispositius disponibles"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activació de la pantalla sense fil"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No s\'ha trobat cap dispositiu a prop."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"S\'està connectant"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Connectada"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"En ús"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"No disponible"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Mostra la configuració"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Vols desconnectar-te?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Això posarà fi a la teva connexió amb:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Opcions de la pantalla sense fils"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Oblida"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Fet"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nom"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Activada"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Desactivada"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Desactivada"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permet l\'intercanvi de dades quan la tauleta toqui un altre dispositiu"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permet l\'intercanvi de dades quan el telèfon toqui un altre dispositiu"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Fet"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Supervisió de xarxa"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Aquest dispositiu està gestionat per:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nEl teu administrador pot fer un seguiment de la teva activitat de xarxa, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nSi vols obtenir més informació, contacta amb l\'administrador."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Un tercer pot supervisar l\'activitat de la\nxarxa, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nAixò és possible gràcies a una credencial de confiança instal·lada al teu dispositiu."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Un tercer pot fer un seguiment de la teva activitat de xarxa, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nHi ha una credencial de confiança instal·lada al teu dispositiu que ho fa possible."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Comprova les credencials de confiança"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Usuaris"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Usuaris i perfils"</string>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a5cd1b6..3b07ef0 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pokud je pole hostitel prázdné, musí být prázdné i pole port."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Zadaný port není platný."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Server proxy protokolu HTTP může používat prohlížeč, ale nesmí jej používat další aplikace."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"Adresa URL PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Místo:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Sousední identifikátor CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon pro hlasitý poslech"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pro hudbu a média"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamatovat nastavení"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Bezdrátový displej"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Chcete-li zobrazit zařízení, zapněte bezdrátový displej."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Bezdrátový displej je zakázán, protože je vypnuté připojení Wi-Fi."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Hledat displeje"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Vyhledávání…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Žádné bezdrátové displeje v okolí"</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Spárované displeje"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dostupná zařízení"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Povolit bezdrátový displej"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"V okolí nebyla nalezena žádná zařízení."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Připojování"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Připojené"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Dostupné"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Používá se"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Není k dispozici"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Nastavení displeje"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Odpojit?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Tímto ukončíte připojení k zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Možnosti bezdrátového displeje"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Odstranit"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Hotovo"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Název"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Zapnuté"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Vypnuté"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Zakázané"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Povolit výměnu dat, pokud se tablet dotkne jiného zařízení"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Povolit výměnu dat, pokud se telefon dotkne jiného zařízení"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Hotovo"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Monitorování sítě"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Toto zařízení je spravováno následující doménou:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nSprávce může monitorovat aktivitu v síti, včetně e-mailů, aplikací a zabezpečených webů.\n\nChcete-li získat další informace, kontaktujte svého správce."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Vaše aktivita v síti, včetně e-mailů, aplikací a zabezpečených\nwebových stránek může být monitorována třetí stranou.\n\nUmožňují to důvěryhodné identifikační údaje nainstalované ve vašem zařízení."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Vaše aktivita v síti, včetně e-mailů, aplikací a zabezpečených webových stránek může být monitorována třetí stranou.\n\nUmožňují to důvěryhodné identifikační údaje nainstalované ve vašem zařízení."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Zkontrolovat důvěryhodné identifikační údaje"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Uživatelé"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Uživatelé a profily"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ffc9c97..c39027a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portfeltet skal være tomt, hvis værtsfeltet er tomt."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Den indtastede port er ikke gyldig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxyen anvendes af browseren, men må ikke bruges af andre apps."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"Webadresse til PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Placering:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Mobiloplysninger:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som højttalertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Til musik og medier"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk indstillinger"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Trådløs skærm"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Aktivér trådløs skærm for at se enhederne."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Trådløs skærm er deaktiveret, fordi Wi-Fi er slået fra."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Søg efter skærme"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Søger…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Der blev ikke fundet nogen trådløse skærme."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Parrede skærme"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Mulige enheder"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktivér trådløs skærm"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Der blev ikke fundet enheder i nærheden."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Tilslutter"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Tilsluttet"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Tilgængelig"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"I brug"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Ikke tilgængelig"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Skærmindstillinger"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Vil du afbryde forbindelsen?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Dette vil afslutte din forbindelse til:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Indstillinger for trådløs skærm"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Glem"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Udført"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Navn"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Til"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Fra"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Deaktiveret"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillad dataudveksling, når tabletten rører en anden enhed"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Tillad dataudveksling, når telefonen rører en anden enhed"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Luk"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Overvågning af netværk"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Denne enhed administreres af:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nAdministratoren kan overvåge din netværksaktivitet, herunder e-mails, apps og sikre websites.\n\nKontakt din administrator for at få flere oplysninger."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"En tredjepart kan overvåge dine netværksaktiviteter, \nf.eks. dine e-mails, apps og sikre websites.\n\nBetroede loginoplysninger, der er installeret på din enhed, gør dette muligt."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"En tredjepart kan overvåge din netværksaktivitet, herunder e-mails, apps og sikre websites.\n\nPålidelige loginoplysninger, der er installeret på din enhed, gør dette muligt."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Kontrollér betroede loginoplysninger"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Brugere"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Brugere og profiler"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 12d3259..6700eca 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Das Feld für den Port muss leer sein, wenn das Feld für den Host leer ist."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Der eingegebene Port ist ungültig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Der HTTP-Proxy wird vom Browser verwendet, möglicherweise aber nicht von anderen Apps."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC-URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Standort:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Benachbarte CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Netz-Info:"</string>
@@ -513,28 +514,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Als Lautsprechertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Für Musik und Medien"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Einstellungen speichern"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Kabellose Übertragung (WiDi)"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Um Geräte zu sehen, aktivieren Sie die kabellose Übertragung (WiDi)."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Kabellose Übertragung (WiDi) ist deaktiviert, da WLAN ausgeschaltet ist."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Nach Displays suchen"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Suche läuft…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Keine kabellose Übertragung in der Nähe"</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Gekoppelte Displays"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Verfügbare Geräte"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Kabellose Übertragung aktivieren"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Kein Gerät in der Nähe gefunden"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Verbindung wird hergestellt..."</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Verbunden"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Verfügbar"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In Verwendung"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Nicht verfügbar"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Display-Einstellungen"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Verbindung trennen?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Hierdurch wird die Verbindung mit&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; getrennt."</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Optionen für kabellose Übertragung (WiDi)"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Entfernen"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Fertig"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Name"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"An"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Aus"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Deaktiviert"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Datenaustausch bei Kontakt mit anderen Geräten zulassen"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Datenaustausch bei Kontakt mit anderen Geräten zulassen"</string>
@@ -1742,8 +1734,8 @@
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Hintergrunddaten deaktivieren?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"Durch die Deaktivierung von Hintergrunddaten kann die Akkulaufzeit verlängert und die Verwendung von Daten verringert werden. Einige Apps nutzen die Hintergrunddatenverbindung eventuell weiterhin."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"App-Daten autom. synchronisieren"</string>
-    <string name="sync_enabled" msgid="4551148952179416813">"Synchronisierung AN"</string>
-    <string name="sync_disabled" msgid="8511659877596511991">"Synchronisierung AUS"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synchronisierung: AN"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synchronisierung: AUS"</string>
     <string name="sync_error" msgid="5060969083117872149">"Synchronisierungsfehler"</string>
     <string name="last_synced" msgid="4242919465367022234">"Zuletzt synchronisiert: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"Synchronisieren…"</string>
@@ -1962,7 +1954,7 @@
     <string name="done_button" msgid="1991471253042622230">"Fertig"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Netzwerküberwachung"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Dieses Gerät wird verwaltet von:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nIhr Administrator kann Ihre Netzwerkaktivitäten überwachen, einschließlich E-Mails, Apps und sicherer Websites.\n\nWenden Sie sich für weitere Informationen an Ihren Administrator."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Dritte können Ihre Netzwerkaktivitäten\nüberwachen, einschließlich E-Mails, Apps und sicherer Websites.\n\nDies wird durch vertrauenswürdige Anmeldedaten ermöglicht, die auf Ihrem Gerät installiert sind."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Dritte können Ihre Netzwerkaktivitäten überwachen, einschließlich E-Mails, Apps und sicherer Websites.\n\nDies wird durch vertrauenswürdige Anmeldedaten ermöglicht, die auf Ihrem Gerät installiert sind."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Vertrauenswürdige Anmeldedaten überprüfen"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Nutzer"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Nutzer &amp; Profile"</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 04356b2..1fab809 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -199,6 +199,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">"Ο διακομιστής μεσολάβησης ΗΤΤΡ χρησιμοποιείται απο το πρόγραμμα περιήγησης, αλλά δεν πρέπει να χρησιμοποιείται από άλλες εφαρμογές."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"Διεύθυνση URL PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Τοποθεσία:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Γειτονικά CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Πληροφορίες κελιού:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ως τηλέφωνο ανοιχτής συνομιλίας"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Για μουσική και πολυμέσα"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Διατήρηση ρυθμίσεων"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Ασύρματη οθόνη"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Για να δείτε τις συσκευές, ενεργοποιήστε την ασύρματη οθόνη."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Η ασύρματη οθόνη έχει απενεργοποιηθεί επειδή το Wi-Fi είναι ανενεργό."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Αναζήτηση για οθόνες"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Αναζήτηση…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Δεν βρέθηκαν κοντινές ασύρματες οθόνες."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Συζευγμένες οθόνες"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Διαθέσιμες συσκευές"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ενεργοποίηση ασύρματης οθόνης"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Δεν βρέθηκαν κοντινές συσκευές."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Γίνεται σύνδεση"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Έχει συνδεθεί"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Διαθέσιμη"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Σε χρήση"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Μη διαθέσιμη"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Ρυθμίσεις προβολής"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Αποσύνδεση;"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Με αυτόν τον τρόπο θα τερματιστεί η σύνδεσή σας με τη συσκευή:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Επιλογές ασύρματης οθόνης"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Διαγραφή"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Τέλος"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Όνομα"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Ενεργή"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Ανενεργή"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Έχει απενεργοποιηθεί"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Να επιτρέπεται η ανταλλαγή δεδομένων όταν το tablet έρχεται σε επαφή με μια άλλη συσκευή"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Να επιτρέπεται η ανταλλαγή δεδομένων όταν το τηλέφωνο αγγίζει μια άλλη συσκευή"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Τέλος"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Παρακολούθηση δικτύου"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Αυτή η συσκευή τελεί υπό τη διαχείριση του:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nΟ διαχειριστής σας έχει τη δυνατότητα να παρακολουθήσει τη δραστηριότητα δικτύου σας, μεταξύ των οποίων μηνύματα ηλεκτρονικού ταχυδρομείου, εφαρμογές και ασφαλείς ιστότοπους.\n\nΓια περισσότερες πληροφορίες, επικοινωνήστε με το διαχειριστή σας."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Ένα τρίτο μέρος έχει δυνατότητα παρακολούθησης της δραστηριότητας\nδικτύου σας, συμπεριλαμβανομένων μηνυμάτων ηλεκτρονικού ταχυδρομείου, εφαρμογών και ασφαλών ιστότοπων.\n\nΈνα αξιόπιστο διαπιστευτήριο που έχει εγκατασταθεί στη συσκευή σας επιτρέπει κάτι τέτοιο."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Ένα τρίτο μέρος έχει τη δυνατότητα να παρακολουθεί τη δραστηριότητα του δικτύου σας, όπως μηνύματα ηλεκτρονικού ταχυδρομείου, εφαρμογές και ασφαλείς ιστότοπους. \n\nΑυτό είναι δυνατό μέσω ενός έγκυρου διαπιστευτηρίου που έχει εγκατασταθεί στη συσκευή σας."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Ελέγξτε τα αξιόπιστα διαπιστευτήρια"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Χρήστες"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Χρήστες και προφίλ"</string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e07dcc8..fa92d55 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"The port field must be empty if the host field is empty."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"The port that you typed is not valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"The HTTP proxy is used by the browser but may not be used by the other apps."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Location:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Neighbouring CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As speaker phone"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For music and media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Wireless display"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"To see devices, turn wireless display on."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Wireless display is disabled because Wi‑Fi is off."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Search for displays"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Searching…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"No nearby wireless displays were found."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Paired displays"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Available devices"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Enable wireless display"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No nearby devices were found."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Connecting"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Connected"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Available"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In use"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Unavailable"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Display settings"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Disconnect?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Wireless display options"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Forget"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Finished"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Name"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"On"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Off"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Disabled"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Allow data exchange when the tablet touches another device"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Allow data exchange when the phone touches another device"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Finished"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Network monitoring"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"This device is managed by:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nYour administrator is capable of monitoring your network activity, including emails, apps and secure websites.\n\nFor more information, contact your administrator."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"A third party is capable of monitoring your network\nactivity, including emails, apps and secure websites.\n\nA trusted credential installed on your device is making this possible."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"A third party is capable of monitoring your network activity, including emails, apps and secure websites.\n\nA trusted credential installed on your device is making this possible."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Check trusted credentials"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Users"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Users &amp; profiles"</string>

diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index e07dcc8..fa92d55 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"The port field must be empty if the host field is empty."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"The port that you typed is not valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"The HTTP proxy is used by the browser but may not be used by the other apps."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Location:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Neighbouring CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As speaker phone"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For music and media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Wireless display"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"To see devices, turn wireless display on."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Wireless display is disabled because Wi‑Fi is off."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Search for displays"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Searching…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"No nearby wireless displays were found."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Paired displays"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Available devices"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Enable wireless display"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No nearby devices were found."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Connecting"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Connected"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Available"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In use"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Unavailable"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Display settings"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Disconnect?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Wireless display options"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Forget"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Finished"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Name"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"On"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Off"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Disabled"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Allow data exchange when the tablet touches another device"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Allow data exchange when the phone touches another device"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Finished"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Network monitoring"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"This device is managed by:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nYour administrator is capable of monitoring your network activity, including emails, apps and secure websites.\n\nFor more information, contact your administrator."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"A third party is capable of monitoring your network\nactivity, including emails, apps and secure websites.\n\nA trusted credential installed on your device is making this possible."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"A third party is capable of monitoring your network activity, including emails, apps and secure websites.\n\nA trusted credential installed on your device is making this possible."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Check trusted credentials"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Users"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Users &amp; profiles"</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 4eea6e8..978b8e5 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El campo del puerto debe estar vacío si el campo de servidor está vacío."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"El puerto que has escrito no es válido."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador usa el proxy HTTP pero tal vez las demás aplicaciones no lo usen."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL de configuración automática de proxy: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID cercano:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Información móvil:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y medios"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recordar la configuración"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Pantalla inalámbrica"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Para ver los dispositivos, activa la pantalla inalámbrica."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"La pantalla inalámbrica está inhabilitada porque la red Wi-Fi está desactivada."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Buscar pantallas"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Buscando..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"No se encontraron pantallas inalámbricas cercanas."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Pantallas sincronizadas"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dispositivos disponibles"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Habilitar pantalla inalámbrica"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No se encontraron dispositivos cercanos."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectada"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"En uso"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"No disponible"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Configuración de visualización"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"¿Desconectar?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Finalizará tu conexión con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Opciones de pantalla inalámbrica"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Borrar"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Listo"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nombre"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Activada"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Desactivada"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Inhabilitada"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir el intercambio de datos cuando la tablet entre en contacto con otro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir el intercambio de datos cuando el dispositivo toque otro dispositivo"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Listo"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Supervisión de red"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Este dispositivo está administrado por:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nEl administrador puede supervisar la actividad de la red, incluido el correo electrónico, las aplicaciones y los sitios web seguros.\n\nPara obtener más información, comunícate con el administrador."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Un tercero puede supervisar la actividad de la red,\nincluidos los mensajes de correo electrónico, las aplicaciones y los sitios web seguros.\n\nEsto es posible debido a que hay una credencial de confianza instalada en el dispositivo."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Un tercero puede supervisar tu actividad en la red, incluido el correo electrónico, las aplicaciones y los sitios web seguros.\n\nEsto ocurre porque hay una credencial de confianza instalada en el dispositivo."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Comprobar credenciales de confianza"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Usuarios"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Usuarios y perfiles"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3c2bc85..ec6d3db 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El campo de puerto debe estar vacío si el campo de host también lo está."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"El puerto que has introducido no es válido."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador utiliza el proxy HTTP, pero no puede utilizarlo otras aplicaciones."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL de configuración automática de proxy: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID anexo"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Información móvil:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz del teléfono"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y contenido multimedia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ajustes de recordatorio"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Pantalla inalámbrica"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Para ver los dispositivos, activa la pantalla inalámbrica."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"La pantalla inalámbrica está inhabilitada porque la red Wi-Fi está desactivada."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Buscar pantallas"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Buscando…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"No hay pantallas inalámbricas cercanas."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Pantallas sincronizadas"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dispositivos disponibles"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Habilitar pantalla inalámbrica"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No hay dispositivos cercanos."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectada"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"En uso"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"No disponible"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Ajustes de pantalla"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"¿Desconectar?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Finalizará la conexión con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Opciones de pantalla inalámbrica"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Borrar"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Listo"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nombre"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Activada"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Desactivada"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Inhabilitada"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir intercambio de datos cuando el tablet toque otro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir el intercambio de datos cuando el teléfono toque otro dispositivo"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Listo"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Supervisión de red"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Este dispositivo está administrado por:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nTu administrador puede supervisar la actividad de la red, incluidos los correos electrónicos, las aplicaciones y los sitios web seguros.\n\nPara obtener más información, ponte en contacto con el administrador."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Un tercero puede supervisar la actividad de la\nred, incluidos los correos electrónicos, las aplicaciones y los sitios web seguros.\n\nEsto es posible gracias a una credencial de confianza instalada en tu dispositivo."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Un tercero puede supervisar tu actividad de la red, incluidos los correos electrónicos, las aplicaciones y los sitios web seguros.\n\nEsto es posible por una credencial de confianza instalada en tu dispositivo."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Comprobar credenciales de confianza"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Usuarios"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Usuarios y perfiles"</string>

diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 3c50952..76b8108 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pordi väli peab olema tühi, kui hosti väli on tühi."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Sisestatud port on kehtetu."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Brauser kasutab HTTP-puhverserverit, kuid muud rakendused ei tohi seda kasutada."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Asukoht:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Külgnev CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Kärjeinfo:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kõlartelefonina"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Muusika ja meediumi jaoks"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Jäta seaded meelde"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Juhtmeta ekraaniühendus"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Seadmete nägemiseks lülitage juhtmeta ekraaniühendus sisse."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Juhtmeta ekraaniühendus on keelatud, sest WiFi on välja lülitatud."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Ekraanide otsimine"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Otsimine …"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Ei leitud WiFi-ekraane."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Seotud ekraanid"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Saadaval seadmed"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Juhtmeta ekraaniühenduse lubamine"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Läheduses seadmeid ei leitud."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Ühendamine"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Ühendatud"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Saadaval"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Kasutusel"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Pole saadaval"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Kuvaseaded"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Kas katkestada ühendus?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"See lõpetab teie ühenduse seadmega:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Juhtmeta ekraaniühenduse valikud"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Unusta"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Valmis"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nimi"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Sees"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Väljas"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Keelatud"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Lubab andmete vahetust, kui tahvelarvuti puudutab teist seadet"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Lubab andmete vahetust, kui telefon puudutab teist seadet"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Valmis"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Võrgu jälgimine"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Seda seadet haldab:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nAdministraator saab jälgida teie võrgutegevusi, sh meile, rakendusi ja turvalisi veebisaite.\n\nLisateabe saamiseks võtke administraatoriga ühendust."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Kolmas osapool saab jälgida teie\nvõrgutoiminguid, sh meile, rakendusi ja turvalisi veebisaite.\n\nSeda võimaldab teie seadmesse installitud usaldusväärne mandaat."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Kolmas osapool saab jälgida teie tegevust võrgus, sh meile, rakendusi ja turvalisi veebisaite.\n\nSeda võimaldab teie seadmesse installitud usaldusväärne mandaat."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Kontrolli usaldusväärseid mandaate"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Kasutajad"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Kasutajad ja profiilid"</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 378210c..909146e 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -199,6 +199,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 توسط مرورگرها استفاده می‌شود اما ممکن است توسط برنامه‌های دیگر استفاده نشود."</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">"‏CID مجاور:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"به‌عنوان تلفن دارای بلندگو"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"برای موسیقی و رسانه"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"به خاطر سپردن تنظیمات"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"نمایش بی‌سیم"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"برای دیدن دستگاه‌ها، صفحه‌نمایش بی‌سیم را روشن کنید."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"‏صفحه نمایش بی‌سیم غیرفعال است زیرا Wi-Fi خاموش است."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"جستجوی صفحه نمایش‌ها"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"در حال جستجو..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"هیچ صفحه نمایش بی‌سیمی در این نزدیکی یافت نشد."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"صفحه‌نمایش‌های مرتبط شده"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"دستگاه‌های موجود"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"فعال کردن امکان نمایش بی‌سیم"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"هیچ دستگاهی در این نزدیکی یافت نشد."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"در حال اتصال"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"متصل"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"در دسترس"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"درحال استفاده"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"در دسترس نیست"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"تنظیمات نمایش"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"اتصال قطع شود؟"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"‏این کار اتصال شما را با این دستگاه قطع می‌کند:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"گزینه‌های صفحه‌نمایش بی‌سیم"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"فراموش کردن"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"انجام شد"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"نام"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"روشن"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"خاموش"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"غیرفعال شد"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"تبادل داده هنگامیکه رایانهٔ لوحی در تماس با دستگاه دیگر است مجاز باشد"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"اجازه برای تبادل داده‌ها هنگامی که تلفن دستگاه دیگری را لمس می‌کند"</string>
@@ -1443,7 +1435,7 @@
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"از <xliff:g id="SERVICE">%1$s</xliff:g> استفاده شود؟"</string>
     <string name="print_service_security_warning_summary" msgid="7567131958613064363">"ممکن است سند شما برای رسیدن به چاپگر از یک یا چند سرور عبور کند."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"سرویسی نصب نشده است"</string>
-    <string name="print_no_printers_found" msgid="989018646884973683">"‏هیچ چاپگری یافت نشدj"</string>
+    <string name="print_no_printers_found" msgid="989018646884973683">"هیچ چاپگری یافت نشد"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"تنظیمات"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"افزودن چاپگرها"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"روشن"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"انجام شد"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"پایش شبکه"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"این دستگاه توسط این افراد مدیریت می‌شود:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nسرپرستتان قادر است بر فعالیت شبکه شما از جمله ایمیل‌ها، برنامه‌ها و وب‌سایت‌های ایمن نظارت داشته باشد.\n\nبرای کسب اطلاعات بیشتر، با سرپرستتان تماس بگیرید."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"یک شخص ثالث قادر به پایش فعالیت شبکه شما،\nاز جمله ایمیل‌ها، برنامه‌ها، و وب‌سایت‌های ایمن است.\n\nاعتبارنامه قابل اعتمادی که بر روی دستگاهتان نصب شده این کار را امکان‌پذیر می‌کند."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"شخص ثالتی می‌تواند بر فعالیت‌های شبکه شما از جمله ایمیل‌ها، برنامه‌ها و وب‌سایت‌های ایمن نظارت داشته باشد.\n\nیک اعتبارنامه مورد اعتماد نصب شده در دستگاه شما این مورد را ممکن می‌سازد."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"بررسی اعتبارنامه‌های قابل اعتماد"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"کاربران"</string>
     <string name="user_list_title" msgid="7937158411137563543">"کاربران و نمایه‌ها"</string>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 67279e4..cbba834 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portti-kentän täytyy olla tyhjä, jos isäntä-kenttä on tyhjä."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Antamasi portti on virheellinen."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Selain saa käyttää HTTP-välityspalvelinta mutta muut sovellukset eivät."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"Välityspalvelimen automaattisen määrityksen URL-osoite: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Sijainti:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naapuri-CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kaiuttimena"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musiikille ja medialle"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Muista asetukset"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Langaton näyttö"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Näet laitteet ottamalla langattoman näytön käyttöön."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Langaton näyttö ei ole käytössä, koska wifi-yhteyttä ei ole muodostettu."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Etsi näyttöjä"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Etsitään..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Ei lähellä olevia langattomia näyttöjä."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Laiteparinäytöt"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Käytettävissä olevat laitteet"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ota langaton näyttö käyttöön"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Bluetooth-laitteita ei löydy lähistöltä."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Yhdistetään"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Yhdistetty"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Käytettävissä"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Käytössä"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Ei saatavilla"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Näyttöasetukset"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Katkaistaanko yhteys?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Katkaisee yhteyden laitteeseen:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Langattomien näyttöjen asetukset"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Unohda"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Valmis"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nimi"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Käytössä"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Ei käytössä"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Ei käytössä"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Salli tiedonsiirto, kun tablet-laite koskettaa toista laitetta"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Salli tiedonsiirto, kun puhelin koskettaa toista laitetta"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Valmis"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Verkon valvonta"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Tämän laitteen hallinnoija on:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nJärjestelmänvalvoja pystyy valvomaan toimiasi verkossa, esimerkiksi sähköpostin, sovellusten ja turvallisten verkkosivustojen käyttöä.\n\nSaat lisätietoja järjestelmänvalvojalta."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Kolmas osapuoli pystyy valvomaan toimiasi verkossa,\nesimerkiksi sähköpostin, sovellusten ja turvallisten verkkosivustojen käyttöä.\n\nLaitteeseesi asennetut luotetut käyttöoikeustiedot tekevät tämän mahdolliseksi."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Kolmas osapuoli pystyy seuraamaan toimiasi verkossa, esimerkiksi sähköpostiviestien, sovellusten ja turvallisten verkkosivustojen käyttöä.\n\nLaitteeseesi asennettu luotettu varmenne tekee tämän mahdolliseksi."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Tarkista luotetut käyttöoikeustiedot"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Käyttäjät"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Käyttäjät ja profiilit"</string>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 039d08d..a2918fe 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Le champ Port doit rester vide si le champ Hôte n\'est pas renseigné."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Le port indiqué n\'est pas valide."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Le serveur mandataire HTTP est utilisé par le navigateur, mais ne peut pas l\'être par les autres applications."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL de configuration automatique de mandataire : "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Emplacement :"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID voisin :"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Infos sur la cellule :"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Comme téléphone à haut-parleur"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pour la musique et le multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Affichage sans fil"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Pour voir les appareils, activez l\'affichage sans fil."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"L\'affichage sans fil est désactivé, car le Wi-Fi n\'est pas activé."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Rechercher affichages"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Searching…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Aucun affichage sans fil trouvé à prox."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Affichages associés"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Appareils disponibles"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activer l\'affichage sans fil"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Aucun appareil détecté à proximité."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Connexion en cours…"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Connecté"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"En cours d\'utilisation"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Non accessible"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Paramètres d\'affichage"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Voulez-vous vraiment vous déconnecter?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Cette opération va mettre fin à votre connexion avec :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Options d\'affichage sans fil"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Supprimer"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Terminé"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"nom"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Activé"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Désactivé"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Désactivés"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Autoriser l\'échange de données lorsque la tablette est en contact avec un autre appareil"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Autoriser l\'échange de données lorsque le téléphone est en contact avec un autre appareil"</string>
@@ -1007,7 +999,7 @@
     <string name="location_title" msgid="1029961368397484576">"My Location"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Haute précision"</string>
-    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Économiser la pile"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Économie de la pile"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Appareil uniquement"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Localisation désactivée"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Demandes localisation récentes"</string>
@@ -1534,7 +1526,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Essayez de vous connecter à un autre appareil Bluetooth."</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"Batterie utilisée par l\'application"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Arrêter ou désinstaller l\'application"</string>
-    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Sélectionnez le mode d\'économie d\'énergie"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Sélectionnez le mode Économie de la pile"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'application dispose peut-être de paramètres permettant de réduire l\'utilisation de la batterie."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batterie utilisée par l\'utilisateur"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Débranché depuis <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -1963,7 +1955,7 @@
     <string name="done_button" msgid="1991471253042622230">"Terminé"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Surveillance réseau"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Cet appareil est géré au sein du domaine suivant :\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nL\'administrateur de ce domaine a la possibilité de surveiller vos activités sur le réseau, notamment vos courriels, vos applications et les sites Web sécurisés.\n\nPour en savoir plus à ce sujet, communiquez avec votre administrateur."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Un tiers peut surveiller votre activité réseau,\n y compris les courriels, les applications et les sites Web sécurisés.\n\nUn certificat de confiance installé sur votre appareil rend cela possible."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Un tiers peut surveiller votre activité réseau, y compris les courriels, les applications et les sites Web sécurisés. \n\nUn certificat de confiance installé sur votre appareil rend cela possible."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Vérifier les certificats de confiance"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Utilisateurs"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Utilisateurs et profils"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 15cf760..9c15cfa 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -90,17 +90,17 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Écran activé :"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Inconnu"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Batterie en charge"</string>
-    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(secteur)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
     <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(sans fil)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"N\'est pas en charge"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Débranchée"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Chargée"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Débranché"</string>
-    <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"Secteur"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
     <string name="battery_info_power_wireless" msgid="6819163295739305097">"sans fil"</string>
-    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA + USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Secteur et USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Inconnu"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Inconnu"</string>
     <string name="battery_info_health_good" msgid="8070356565806711806">"Bon"</string>
@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Le champ Port doit rester vide si le champ Hôte n\'est pas renseigné."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Le port indiqué n\'est pas valide."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Le proxy HTTP est utilisé par le navigateur, mais ne peut pas l\'être par les autres applications."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL de configuration automatique de proxy : "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Emplacement :"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID voisin :"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Infos sur la cellule :"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Comme téléphone à haut-parleur"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pour la musique et le multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Affichage sans fil"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Pour voir les appareils, activez l\'affichage sans fil."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"L\'affichage sans fil est désactivé, car le Wi-Fi n\'est pas activé."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Rechercher affichages"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Recherche en cours…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Aucun affichage sans fil trouvé à prox."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Affichages associés"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Appareils disponibles"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activer l\'affichage sans fil"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Aucun appareil détecté à proximité."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Connexion en cours…"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Connecté"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"En cours d\'utilisation"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Indisponible"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Paramètres d\'affichage"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Voulez-vous vraiment vous déconnecter ?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Cette opération va mettre fin à votre connexion avec :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Options d\'affichage sans fil"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Supprimer"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"OK"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nom"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Activé"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Désactivé"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Désactivé"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Autoriser l\'échange de données lorsque la tablette est en contact avec un autre appareil"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Autoriser l\'échange de données lorsque le téléphone touche un autre appareil"</string>
@@ -1963,7 +1955,7 @@
     <string name="done_button" msgid="1991471253042622230">"OK"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Surveillance du réseau"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Cet appareil est géré par l\'administrateur suivant :\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nVotre administrateur a la possibilité de surveiller vos activités sur le réseau, y compris les e-mails, les applications et les sites Web sécurisés.\n\nPour en savoir plus, veuillez contacter votre administrateur."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Il est possible qu\'un tiers surveille votre activité sur le réseau,\ny compris les e-mails, les applications et les sites Web sécurisés.\n\nCela est dû à la présence d\'un certificat de confiance installé sur votre appareil."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Des tiers ont la possibilité de surveiller votre activité sur le réseau, y compris en ce qui concerne les e-mails, les applications et les sites Web sécurisés.\n\nUn certificat de confiance installé sur votre appareil rend cela possible."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Vérifier les certificats de confiance"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Utilisateurs"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Utilisateurs et profils"</string>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 5744a81..6fbd5f5 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -199,6 +199,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 प्रॉक्सी का उपयोग ब्राउज़र द्वारा किया जाता है लेकिन अन्य ऐप्स द्वारा उपयोग नहीं किया जा सकता."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"स्थान:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"समीपस्‍थ CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"सेल जानकारी:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"स्‍पीकर फ़ोन के रूप में"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत और मीडिया के लिए"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिंग याद रखें"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Wifi दिखाई देने के लिए सेटिंग"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"उपकरणों को देखने के लिए, वायरलेस का दिखाई देना चालू करें."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"वायरलेस नही दिख रहा है क्योंकि Wi-Fi बंद है."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"प्रदर्शनों के लिए खोजें"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"खोज रहा है…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"आस-पास कोई भी वायरलेस प्रदर्शन नहीं मिले."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"युग्मित प्रदर्शन"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"उपलब्ध उपकरण"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"वायरलेस डिस्प्ले सक्षम करें"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"आस-पास कोई भी उपकरण नहीं मिला."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"कनेक्ट कर रहा है"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"कनेक्ट किया गया"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"उपलब्ध"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"उपयोग में"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"अनुपलब्ध"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Wifi के लिए सेटिंग"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"डिस्‍कनेक्‍ट करें?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"इससे &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; के साथ आपका कनेक्शन समाप्त हो जाएगा"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Wifi दिखाई देने के लिए के विकल्प"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"भूलें"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"पूर्ण"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"नाम"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"चालू"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"बंद"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"अक्षम"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"जब टेबलेट अन्य उपकरण को स्पर्श करे तो डेटा विनिमय करने दें"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"जब फ़ोन अन्य उपकरण को स्पर्श करे तो डेटा विनिमय करने दें"</string>
@@ -1534,7 +1526,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"किसी दूसरे Bluetooth उपकरण से कनेक्‍ट करने का प्रयास करें"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"ऐप्स द्वारा उपयोग की गई बैटरी"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"ऐप्स रोकें या अनइंस्‍टॉल करें"</string>
-    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"बैटरी-बचत मोड चुनें"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"बैटरी की बचत मोड चुनें"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"बैटरी के उपयोग में कमी लाने के लिए ऐप्स, सेटिंग ऑफ़र कर सकता है"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"उपयोगकर्ता के द्वारा उपयोग की गई बैटरी"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"अनप्लग करने के बाद से <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"पूर्ण"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"नेटवर्क मॉनिटरिंग"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"यह उपकरण इसके द्वारा प्रबंधित है:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nआपका व्यवस्थापक, ईमेल, एप्लिकेशन, और सुरक्षित वेबसाइटों सहित, आपकी नेटवर्क गतिविधि को मॉनीटर करने में सक्षम है.\n\nअधिक जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"तृतीय पक्ष आपकी नेटवर्क\nगतिविधि के साथ ही ईमेल, एप्लिकेशन, और सुरक्षित वेबसाइटों को मॉनीटर कर सकता है.\n\nऐसा आपके उपकरण पर इंस्टॉल किए गए विश्वसनीय क्रेडेंशियल के कारण हो रहा है."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"एक तृतीय पक्ष ईमेल, ऐप्स और सुरक्षित वेबसाइटों सहित आपकी नेटवर्क गतिविधि को मॉनीटर करने में सक्षम है.\n\nआपके उपकरण पर इंस्टॉल किए गए एक विश्वसनीय क्रेंडेशियल के कारण ऐसा संभव हो रहा है."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"विश्वसनीय क्रेडेंशियल की जांच करें"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"उपयोगकर्ता"</string>
     <string name="user_list_title" msgid="7937158411137563543">"उपयोगकर्ता और प्रोफ़ाइल"</string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e23fa8a..ea41270 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Polje priključka mora biti prazno ako je i polje hosta prazno."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Upisani priključak nije valjan."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Preglednik upotrebljava HTTP proxy poslužitelj, ali druge aplikacije ne mogu ga upotrebljavati."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL za PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susjedski CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informacije o ćeliji:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kao telefonski zvučnik"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za glazbu i medije"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamti postavke"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Bežični prikaz"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Da biste vidjeli uređaje, uključite bežični prikaz."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Bežični je zaslon onemogućen jer je Wi-Fi isključen."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Traži zaslone"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Pretraživanje..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Nije pronađen nijedan bežični zaslon u blizini."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Upareni zasloni"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dostupni uređaji"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Omogući bežični prikaz"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"U blizini nema uređaja."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Povezivanje"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Povezan"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Dostupan"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"U upotrebi"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Nedostupno"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Postavke zaslona"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Isključiti?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"To će prekinuti vašu vezu s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Opcije bežičnog prikaza"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Zaboravi"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Gotovo"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Naziv"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Uključeno"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Isključeno"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Onemogućeno"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Dopusti razmjenu podataka kada tabletno računalo dodiruje drugi uređaj"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Dopusti razmjenu podataka kada telefon dodiruje drugi uređaj"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Završeno"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Nadzor mreže"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Tim uređajem upravlja:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nVaš administrator može nadzirati vaše aktivnosti na mreži, uključujući e-poštu, aplikacije i sigurne web-lokacije.\n\nZa više informacija obratite se svom administratoru."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Treća strana može nadzirati vaše mrežne\naktivnosti, uključujući e-poštu, aplikacije i sigurne web-lokacije.\n\nTo omogućuje pouzdana vjerodajnica instalirana na vašem uređaju."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Treća je strana u mogućnosti pratiti vašu mrežnu aktivnost, uključujući e-poštu, aplikacije i sigurne web-lokacije.\n\nTo omogućuje pouzdana vjerodajnica koja je instalirana na vašem uređaju."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Provjeri pouzdane vjerodajnice"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Korisnici"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Korisnici i profili"</string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 6bf160b..20298e3 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"A port mezőnek is üresnek kell maradnia, ha a gazdagép mező üres."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"A megadott port nem érvényes."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"A HTTP proxyt a böngésző használja, ám más alkalmazások nem használhatják."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Hely:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Környező CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Cellainformáció:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefonhangszóróként"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Zenéhez és médiához"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Beállítások megjegyzése"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Vezeték nélküli kijelző"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Az eszközök megtekintéséhez kapcsolja be a vezeték nélküli kijelzőt."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"A vezeték nélküli kijelző le van tiltva, mert a Wi-Fi ki van kapcsolva."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Kijelzők keresése"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Keresés..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Nem található a közelben vezeték nélküli kijelző."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Párosított kijelzők"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Elérhető eszközök"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Vezeték nélküli kijelző engedélyezése"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nem található a közelben más eszköz."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Csatlakozás"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Csatlakozva"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Elérhető"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Használatban"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Nem érhető el"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Megjelenítési beállítások"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Megszakítja?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Ezzel befejezi a kapcsolatot a következővel:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Vezeték nélküli kijelzés beállításai"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Elfelejt"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Kész"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Név"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Be"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Ki"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Letiltva"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tegye lehetővé az adatcserét, ha a táblagép érintkezik egy másik eszközzel."</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Lehetővé teszi az adatok cseréjét, ha a telefon érintkezik egy másik készülékkel"</string>
@@ -1963,7 +1955,7 @@
     <string name="done_button" msgid="1991471253042622230">"Kész"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Hálózatfelügyelet"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Ezt az eszközt a következő domain felügyeli:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nA rendszergazda figyelheti a hálózati tevékenységet, beleértve az e-mailt, az alkalmazásokat és a biztonságos weboldalakat.\n\nTovábbi információért forduljon a rendszergazdához."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Egy harmadik fél megfigyelheti az Ön hálózati\ntevékenységét, beleértve az e-maileket, alkalmazásokat és biztonságos webhelyeket.\n\nEgy, az eszközre telepített megbízható tanúsítvány teszi ezt lehetővé."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Egy harmadik fél képes az Ön hálózati tevékenységének figyelésére, beleértve az e-maileket, az alkalmazásokat és a biztonságos webhelyeket is.\n\nEzt az Ön eszközére telepített megbízható hitelesítési adatok teszik lehetővé."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Megbízható tanúsítványok ellenőrzése"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Felhasználók"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Felhasználók és profilok"</string>

diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 8df164e..be7fc4f 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml

@@ -199,6 +199,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 պրոքսին օգտագործվում է զննարկչի կողմից, բայց չի կարող օգտագործվել այլ ծրագրերի կողմից:"</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL` "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Տեղակայում."</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Կից CID՝"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Բջջայինի տեղեկություններ`"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Որպես բարձրախոս հեռախոս"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Երաժշտության և մեդիայի համար"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Հիշել կարգավորումները"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Անլար էկրան"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Սարքերը տեսնելու համար միացրեք անլար էկրանը:"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Անլար ցուցադրումը կասեցված է, քանի որ Wi‑Fi-ը անջատված է:"</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Որոնել ցուցադրիչներ"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Որոնում..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Մոտակայքում անլար ցուցադրիչներ չեն գտնվել:"</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Զուգավորված ցուցադրիչներ"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Հասանելի սարքեր"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Միացնել անլար էկրանը"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Մոտակայքում սարքեր չեն գտնվել:"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Միանում է"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Միացված է"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Հասանելի"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Արդեն օգտագործվում է"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Անհասանելի է"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Ցուցադրել կարգավորումները"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Անջատե՞լ:"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Սա կավարտի կապը &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;-ի հետ"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Անլար ցուցադրվող ընտրանքներ"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Մոռանալ"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Կատարված է"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Անուն"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Միացված"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Անջատել"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Անջատված է"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Թույլատրել տվյալների փոխանակումը, երբ գրասալիկը հպում է այլ սարքի"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Թույլատրել տվյալների փոխանակումը, երբ հեռախոսը հպում է մեկ այլ սարքի"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Կատարված է"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Ցանցի մշտադիտարկում"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Այս սարքը կառավարվում է հետևյալ տիրույթի կողմից՝\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nՁեր վարիչը հնարավորություն ունի վերահսկելու ձեր գործունեությունը ցանցում՝ ներառյալ ձեր նամակները, ծրագրերը և անվտանգ կայքերը:\n\nԼրացուցիչ տեղեկությունների համար դիմեք ձեր վարիչին:"</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Երրորդ կողմն ի վիճակի է վերահսկել ձեր ցանցային\nգործունեությունը, այդ թվում՝ նամակները, հավելվածները և անվտանգ կայքերը:\n\nՁեր սարքում տեղադրված վստահելի վկայագրերը տալիս են դրա հնարավորությունը:"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Երրորդ կողմն ի վիճակի է վերահսկել ձեր ցանցային գործունեությունը, այդ թվում՝ նամակները, ծրագրերը և անվտանգ կայքերը:\n\nՁեր սարքում տեղադրված վստահելի հավատարմագիրն է դա հնարավոր դարձնում:"</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Ստուգել վստահելի վկայագրերը"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Օգտվողներ"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Օգտվողներ &amp; պրոֆիլներ"</string>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 1fe606b..de9b562 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -85,7 +85,7 @@
     <string name="battery_info_temperature_label" msgid="1968383098818648037">"Suhu baterai:"</string>
     <string name="battery_info_temperature_units" msgid="9098950587249987550">"° C"</string>
     <string name="battery_info_uptime" msgid="5548545143573527992">"Waktu sejak boot:"</string>
-    <string name="battery_info_awake_battery" msgid="2557725975486185849">"Waktu bangun pada baterai:"</string>
+    <string name="battery_info_awake_battery" msgid="2557725975486185849">"Memakai baterai:"</string>
     <string name="battery_info_awake_plugged" msgid="176716874713478188">"Waktu bangun ketika mengisi daya:"</string>
     <string name="battery_info_screen_on" msgid="376277447175613889">"Waktu AKTIF layar:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Tidak diketahui"</string>
@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Bidang port harus kosong jika bidang host kosong."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Port yang Anda ketik tidak valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP digunakan oleh browser, namun tidak boleh digunakan oleh apl lain."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasi:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID bersebelahan:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sebagai pengeras suara telepon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Untuk musik dan media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat setelan"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Layar nirkabel"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Untuk melihat perangkat, nyalakan layar nirkabel."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Layar nirkabel dinonaktifkan karena Wi-Fi mati."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Telusuri layar"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Menelusuri..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Tidak menemukan layar nirkabel terdekat"</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Layar yang disandingkan"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Perangkat yang tersedia"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktifkan layar nirkabel"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Tidak ditemukan perangkat terdekat."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Menyambung"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Tersambung"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Tersedia"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Sedang digunakan"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Tidak tersedia"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Setelan layar"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Putuskan sambungan?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Ini akan mengakhiri sambungan Anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Opsi layar nirkabel"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Lupakan"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Selesai"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nama"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Nyala"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Mati"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Dinonaktifkan"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Memungkinkan pertukaran data saat tablet bersentuhan dengan perangkat lain"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Memungkinkan pertukaran data saat ponsel bersentuhan dengan perangkat lain"</string>
@@ -593,7 +585,7 @@
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Penyiapan Wi-Fi yang Dilindungi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Memulai WPS..."</string>
     <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Tekan tombol Penyiapan Wi-Fi yang Dilindungi di router Anda. Ini dapat disebut \"WPS\" atau berisi simbol ini:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Masukkan PIN <xliff:g id="NUMBER">%1$s</xliff:g> pada router Wi-Fi Anda. Penyiapan perlu waktu hingga dua menit untuk selesai."</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Masukkan PIN <xliff:g id="NUMBER">%1$s</xliff:g> pada router Wi-Fi. Penyiapan perlu waktu hingga dua menit untuk selesai."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS berhasil. Menyambung ke jaringan..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Tersambung ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS sedang berlangsung dan memerlukan waktu hingga dua menit untuk selesai"</string>
@@ -1369,9 +1361,9 @@
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Setelah Anda membuat widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> dapat mengakses semua data yang ditampilkannya."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Selalu izinkan <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> untuk membuat widget dan mengakses data mereka"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>h <xliff:g id="HOURS">%2$d</xliff:g>j <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>d"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>jam<xliff:g id="MINUTES">%2$d</xliff:g>men <xliff:g id="SECONDS">%3$d</xliff:g>det"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>jam <xliff:g id="MINUTES">%2$d</xliff:g>mnt <xliff:g id="SECONDS">%3$d</xliff:g>dtk"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>menit <xliff:g id="SECONDS">%2$d</xliff:g> detik"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>det"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>dtk"</string>
     <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>h <xliff:g id="HOURS">%2$d</xliff:g>j <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
     <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>j <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
     <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Selesai"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Pemantauan jaringan"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Perangkat ini dikelola oleh:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nAdministrator Anda dapat mengawasi aktivitas jaringan Anda, termasuk email, aplikasi, dan situs web aman.\n\nUntuk informasi selengkapnya, hubungi administrator Anda."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Pihak ketiga dapat memantau aktivitas\njaringan Anda, termasuk email, aplikasi, dan situs web aman.\n\nKredensial tepercaya yang terpasang di perangkat Anda membuatnya dapat dilakukan."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Pihak ketiga dapat memantau aktivitas jaringan Anda, termasuk email, aplikasi, dan situs web aman.\n\nKredensial terpercaya yang dipasang pada perangkat Anda memungkinkan hal ini."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Periksa kredensial tepercaya"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Pengguna"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Pengguna &amp; profil"</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2a5cf76..544d2e1 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Il campo Porta deve essere vuoto se il campo Host è vuoto."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"La porta specificata non è valida."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Il proxy HTTP viene utilizzato dal browser ma potrebbe non essere utilizzato da altre applicazioni."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posizione:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID adiacente:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Come vivavoce"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per musica e audio media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ricorda impostazioni"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Visualizzazione wireless"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Per visualizzare i dispositivi, attiva la visualizzazione wireless."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"La visualizzazione wireless non è attiva perché il Wi‑Fi non è attivo."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Cerca schermi"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Ricerca in corso…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Nessuno schermo wireless vicino trovato."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Schermi accoppiati"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dispositivi disponibili"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Attiva display wireless"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nessun dispositivo Bluetooth vicino."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Collegamento in corso"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Connesso"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponibile"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In uso"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Non disponibile"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Impostazioni di visualizzazione"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Disconnettere?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Questa operazione terminerà la connessione con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Opzioni di visualizzazione wireless"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Elimina"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Fine"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"ON"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"OFF"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Disattivata"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Consenti lo scambio di dati quando il tablet tocca un altro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Consenti lo scambio di dati quando il telefono tocca un altro dispositivo"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Fine"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Monitoraggio rete"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Questo dispositivo è gestito da:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nL\'amministratore è in grado di monitorare la tua attività di rete, inclusi siti web protetti, email e app.\n\nPer ulteriori informazioni rivolgiti all\'amministratore."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Una terza parte è in grado di monitorare l\'attività della\nrete, inclusi siti web sicuri, email e app.\n\nCiò è reso possibile da una credenziale attendibile installata sul dispositivo."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Una terza parte può monitorare la tua attività di rete, inclusi siti web protetti, email e applicazioni.\n\nQuesto è reso possibile da credenziali attendibili installate sul tuo dispositivo."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Verifica credenziali attendibili"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Utenti"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Utenti e profili"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b24ffda..458b553 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -199,6 +199,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">"‏שרת ה-Proxy של HTTP נמצא בשימוש הדפדפן, אך אפליקציות אחרות לא יכולים להשתמש בו."</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">"‏CID שכן:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"נתונים:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"כטלפון דיבורית"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"עבור מוסיקה ומדיה"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"זכור הגדרות"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"צג אלחוטי"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"כדי לראות מכשירים, הפעל את הצג האלחוטי."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"‏הצג האלחוטי מושבת מפני שה-Wi-Fi כבוי."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"חפש צגים"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"מחפש…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"לא נמצאו צגים אלחוטיים קרובים."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"צגים מותאמים"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"מכשירים זמינים"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"‏הפעל תצוגת WiFi"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"לא נמצאו מכשירים בקרבת מקום."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"מתחבר"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"מחובר"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"זמין"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"בשימוש"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"לא זמין"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"הגדרות תצוגה"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"להתנתק?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"‏פעולה זו תסיים את החיבור עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"אפשרויות צג אלחוטי"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"שכח"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"סיום"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"שם"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"מופעל"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"כבוי"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"מושבת"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"אפשר חילופי מידע כאשר הטאבלט נוגע במכשיר אחר"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"אפשר החלפת נתונים כאשר הטלפון נוגע במכשיר אחר"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"בוצע"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"ניטור רשתות"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"המכשיר הזה מנוהל על ידי:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nמנהל המערכת יכול לנטר את הפעילות שלך ברשת, כולל דוא\"ל, אפליקציות ואתרים מאובטחים.\n\nלמידע נוסף, פנה אל מנהל המערכת."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"צד שלישי יכול לנטר את הפעילות שלך\nברשת, כולל הודעות דוא\"ל, אפליקציות ואתרים מאובטחים.\n\nמצב זה מתאפשר על ידי פרטי כניסה מהימנים המותקנים במכשיר שלך."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"צד שלישי מסוגל לעקוב אחר הפעילות שלך ברשת, כולל הודעות דוא\"ל, אפליקציות ואתרים מאובטחים.\n\nאישור מהימן המותקן במכשיר מאפשר זאת."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"בדוק פרטי כניסה מהימנים"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"משתמשים"</string>
     <string name="user_list_title" msgid="7937158411137563543">"משתמשים ופרופילים"</string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3126e08..84da410 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -201,6 +201,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プロキシはブラウザで使用されていますが、他のアプリでは使用できません。"</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ロケーション:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"近くのCID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"セル情報:"</string>
@@ -514,28 +515,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"スピーカーフォン"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"音楽とメディア"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"設定を保存"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"ワイヤレスディスプレイ"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"デバイスを表示するにはワイヤレスディスプレイをONにしてください。"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Wi-FiがOFFになっているためワイヤレスディスプレイは無効になっています。"</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"ディスプレイを検索"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"検索中…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"付近にワイヤレスディスプレイは見つかりません。"</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"ペア設定されたディスプレイ"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"使用可能なデバイス"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ワイヤレスディスプレイを有効にする"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"周辺にデバイスが見つかりません"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"接続中"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"接続済み"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"使用可能"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"使用中"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"ご利用いただけません"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"ディスプレイの設定"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"切断しますか？"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"この操作を行うと、次のデバイスとの接続が切断されます:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"ワイヤレスディスプレイのオプション"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"切断"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"完了"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"名前"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"ON"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"OFF"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"無効"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"タブレットが他のデバイスと接触したときのデータ交換を許可する"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"端末が他のデバイスと接触したときのデータ交換を許可する"</string>
@@ -1967,7 +1959,7 @@
     <string name="done_button" msgid="1991471253042622230">"完了"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"ネットワーク監視"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"この端末は<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>によって管理されています。\n\n\n管理者はあなたのネットワークアクティビティ（メール、アプリ、保護されたウェブサイトなど）を監視できます。\n\n詳しくは管理者にお問い合わせください。"</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"第三者があなたのネットワークアクティビティ\n（メール、アプリ、保護されたウェブサイトなど）を監視できます。\n\nこれは、信頼できる認証情報が端末にインストールされているためです。"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"第三者があなたのネットワークアクティビティ（メール、アプリ、保護されたウェブサイトなど）を監視できます。\n\nこれは、信頼できる認証情報が端末にインストールされているためです。"</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"信頼できる認証情報を確認"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"ユーザー"</string>
     <string name="user_list_title" msgid="7937158411137563543">"ユーザーとプロフィール"</string>

diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 7237804..6d8b218 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml

@@ -199,6 +199,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 პროქსი სერვერს იყენებს ბრაუზერი, თუმცა მისი გამოყენება სხვა აპლიკაციების მიერ დაუშვებელია."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"მდებარეობა:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"მეზობელი CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"ქსელის ინფო:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ხმამაღლამოსაუბრე კავშირისათვის"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"მუსიკისა და მულტიმედიისათვის"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"პარამეტრების დამახსოვრება"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"უსადენო ეკრანი"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"მოწყობილობის სანახავად ჩართეთ უკაბელო ეკრანი."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"უსადენო ეკრანი გამორთულია, რადგან გათიშულია Wi-Fi."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"ეკრანების ძიება"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"ძებნა…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"ახლომახლო უსადენო ეკრანები ვერ მოიძებნა."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"დაწყვილებული ინტერფეისები"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"ხელმისაწვდომი მოწყობილობები"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"უსადენო ეკრანის ჩართვა"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ახლომახლო მოწყობილობების მოძიება ვერ მოხერხდა."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"მიმდინარეობს დაკავშირება"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"დაკავშირებულია"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"ხელმისაწვდომი"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"გამოიყენება"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"მიუწვდომელი"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"ეკრანის პარამეტრები"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"გავწყვიტო კავშირი?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"ეს დაასრულებს თქვენს კავშირს :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"უსადენო ინტერფეისის პარამეტრები"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"დავიწყება"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"დასრულდა"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"სახელი"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"ჩართული"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"გამორთულია"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"გამორთული"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"ტაბლეტის სხვა მოწყობილობასთან შეხებისას მონაცემთა გაცვლის საშუალება"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"მონაცემთა გაცვლის უფლების მიცემა ტელეფონის სხვა მოწყობილობასთან შეხებისას"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"დასრულება"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"ქსელის მონიტორინგი"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"ეს მოწყობილობა იმართება:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n-ის მიერ\nთქვენს ადმინისტრატორს შეუძლია თქვენი ქსელის აქტივობის მონიტორინგი, მათ შორის ელფოსტების, აპების და უსაფრთხო საიტების.\n\nდამატებითი ინფორმაციისათვის, დაუკავშირდით ადმინისტრატორს."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"მესამე მხარეს შეუძლია განახორციელოს თქვენი ქსელის \nაქტივობის მონიტორინგი, მათ შორის ელფოსტების, აპების და უსაფრთხო ვებსაიტების.\n\nეს შესაძლებელია თქვენს მოწყობილობაზე დაყენებული სანდო სამომხმარებლო მონაცემების საშუალებით."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"მესამე მხარეს თქვენი ქსელის აქტივობის მონიტორინგი შეუძლია, მათ შორის ელფოსტების, აპების და უსაფრთხო საიტების.\n\nეს შესაძლებელი ხდება თქვენს მოწყობილობაზე დაყენებული სანდო აუთენტიფიკაციის მონაცემების საშუალებით."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"სანდო სამომხმარებლო მონაცემების შემოწმება"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"მომხმარებლები"</string>
     <string name="user_list_title" msgid="7937158411137563543">"მომხმარებლები და პროფილები"</string>

diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index d1a88e5..17068ef 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml

@@ -199,6 +199,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 ត្រូវបានប្រើដោយកម្មវិធីអ៊ីនធឺណិត ប៉ុន្តែអាចមិនត្រូវបានប្រើដោយកម្មវិធីផ្សេង។"</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ទីតាំង៖"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID នៅជិត៖"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"ព័ត៌មានចល័ត៖"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ជាអូប៉ាល័រទូរស័ព្ទ"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"សម្រាប់តន្ត្រី និងមេឌៀ"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ចងចាំការកំណត់"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"ការបង្ហាញឥតខ្សែ"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"ដើម្បីមើលឧបករណ៍ បើកការបង្ហាញបណ្ដាញឥតខ្សែ។"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"បានបិទការបង្ហាញបណ្ដាញឥតខ្សែ ព្រោះបានបិទវ៉ាយហ្វាយ។"</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"ស្វែងរកការបង្ហាញ"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"កំពុងស្វែងរក..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"រកមិនឃើញការបង្ហាញបណ្ដាញឥតខ្សែនៅជិតនេះទេ"</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"បង្ហាញឧបករណ៍បានផ្គូផ្គង"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"ឧបករណ៍អាចប្រើបាន"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"បើកការបង្ហាញឥតខ្សែ"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"រកមិនឃើញឧបករណ៍ដែលនៅក្បែរ"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"តភ្ជាប់"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"បានតភ្ជាប់"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"អាចប្រើបាន"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"កំពុងប្រើ"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"មិនអាចប្រើបាន"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"កំណត់ការបង្ហាញ"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"ផ្ដាច់?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"វានឹងបញ្ចប់ការតភ្ជាប់របស់អ្នកជាមួយ៖&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"ជម្រើសបង្ហាញបណ្ដាញឥតខ្សែ"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"ភ្លេច"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"រួចរាល់"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"ឈ្មោះ"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"បើក"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"បិទ"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"បិទ"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"ឲ្យប្ដូរទិន្នន័យ ពេលកុំព្យូទ័របន្ទះប៉ះឧបករណ៍ផ្សេង"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"ឲ្យប្ដូរទិន្នន័យពេលទូរស័ព្ទប៉ះឧបករណ៍ផ្សេង"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"រួចរាល់"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"ការត្រួតពិនិត្យបណ្ដាញ"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"ឧបករណ៍នេះត្រូវបានគ្រប់គ្រងដោយ៖ \n <xliff:g id="MANAGING_DOMAIN">%s</xliff:g> \n \n អ្នកគ្រប់គ្រងរបស់អ្នកមានសមត្ថភាពក្នុងការត្រួតពិនិត្យសកម្មភាពបណ្ដាញរបស់អ្នក រួមបញ្ចូលទាំងអ៊ីមែល, កម្មវិធីនិងគេហទំព័រដែលមានសុវត្ថិភាព។ \n \n សម្រាប់ព័ត៌មានបន្ថែមសូមទាក់ទងអ្នកគ្រប់គ្រងរបស់អ្នក។"</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"ភាគីទីបីអាចពិនិត្យសកម្មភាព \n បណ្ដាញរបស់អ្នករួមមាន អ៊ីមែល កម្មវិធី និងតំបន់បណ្ដាញដែលមានសុវត្ថិភាព។\n\n ការដែលដំឡើងអត្តសញ្ញាណដែលទុកចិត្តលើឧបករណ៍របស់អ្នកបង្កជាហេតុដូចនេះ។"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"ភាគីទីបីមានសមត្ថភាពគ្រប់គ្រងសកម្មភាពបណ្ដាញរបស់អ្នក រួមមានអ៊ីមែល កម្មវិធី និងសុវត្ថិភាពតំបន់បណ្ដាញ។ \n \n ព័ត៌មានសម្ងាត់ដែលទុកចិត្តត្រូវបានដំឡើងនៅលើឧបករណ៍របស់អ្នកដើម្បីឲ្យវាអាចធ្វើបាន។"</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"ពិនិត្យអត្តសញ្ញាណដែលបានទុកចិត្ត"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"អ្នកប្រើ"</string>
     <string name="user_list_title" msgid="7937158411137563543">"អ្នកប្រើ &amp; ប្រវត្តិរូប"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a0b72cc..d5d21b8 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -199,6 +199,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 프록시는 브라우저에서 사용되며 다른 앱에서는 사용되지 않을 수 있습니다."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"위치:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"인접한 CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"스피커폰으로 사용"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"음악 및 미디어"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"설정 기억"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"무선 디스플레이"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"기기를 확인하려면 무선 디스플레이를 켜세요."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Wi-Fi가 꺼져 있기 때문에 무선 디스플레이를 사용할 수 없습니다."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"디스플레이 검색"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"검색 중..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"주변에 검색된 무선 디스플레이가 없습니다."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"페어링된 디스플레이"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"사용가능 기기"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"무선 디스플레이 사용"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"근처에 기기가 없습니다."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"연결 중"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"연결됨"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"사용 가능"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"사용 중"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"사용할 수 없음"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"디스플레이 설정"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"연결을 해제하시겠습니까?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 연결이 끊어집니다."</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"무선 디스플레이 옵션"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"삭제"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"완료"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"이름"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"사용"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"사용 안함"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"사용 중지됨"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"태블릿이 다른 기기와 접촉하면 데이터 교환 허용"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"휴대전화가 다른 기기와 접촉하면 데이터 교환 허용"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"완료"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"네트워크 모니터링"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"이 기기는\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>에서 관리합니다.\n\n관리자는 이메일, 앱 및 보안 웹사이트를 포함한 네트워크 활동을 모니터링할 수 있습니다.\n\n자세한 정보는 관리자에게 문의하세요."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"기기에 신뢰할 수 있는 자격증명이 설치되어있기\n 때문에 제3자가 이메일, 앱 및 보안 웹사이트를 포함한 네트워크 활동을 모니터링할 수 있습니다.\n\n"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"기기에 신뢰할 수 있는 자격증명이 설치되어 있기 때문에\n제3자가 이메일, 앱, 보안 웹사이트를 포함한 네트워크 활동을 모니터링 할 수 있습니다.\n"</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"신뢰할 수 있는 자격증명 확인"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"사용자"</string>
     <string name="user_list_title" msgid="7937158411137563543">"사용자 및 프로필"</string>

diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 38a5bb4..7a0313c 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"ຊ່ອງຂໍ້ມູນພອດຈະຕ້ອງປ່ອຍຫວ່າງໄວ້ ຫາກວ່າຊ່ອງ host ຫວ່າງຢູ່."</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" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ສະຖານທີ່:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID ໃກ້ຄຽງ:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"ຂໍ້ມູນ cell:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ເປັນລຳໂພງ"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ສຳລັບເພງ ແລະສື່"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ຈື່ການຕັ້ງຄ່າ"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"ການສະແດງຜົນໄຮ້ສາຍ"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"ເພື່ອເບິ່ງລາຍຊື່ອຸປະກອນ, ໃຫ້ເປີດການສະແດງຜົນໄຮ້ສາຍ."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"ການສະແດງຜົນໄຮ້ສາຍຖືກປິດເນື່ອງຈາກ Wi-Fi ບໍ່ໄດ້ເປີດ."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"ຊອກຫາການສະແດງຜົນ"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"ກຳລັງຊອກຫາ..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"ບໍ່ພົບເຄືອຂ່າຍໄຮ້ສາຍໃນບໍລິເວນໃກ້ຄຽງ."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"ຈໍສະແດງຜົນທີ່ຈັບຄູ່ກັນ"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"ອຸປະກອນທີ່ສາມາດໃຊ້ໄດ້"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ເປີດໃຊ້ງານການສະແດງພາບໄຮ້ສາຍ"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ບໍ່ມີອຸປະກອນຢູ່ໃນບໍລິເວນໃກ້ຄຽງ."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"ກຳລັງເຊື່ອມຕໍ່"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"ສາມາດໃຊ້ໄດ້"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"ກຳລັງນຳໃຊ້"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"ບໍ່ມີ"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"ການຕັ້ງຄ່າສະແດງຜົນ"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"ຕັດການເຊື່ອມຕໍ່?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"ນີ້ຈະເປັນການສິ້ນສຸດການເຊື່ອມຕໍ່ກັບ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"ໂຕເລືອກການສະແດງຜົນໄຮ້ສາຍ"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"ລືມເຄືອຂ່າຍນີ້"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"ແລ້ວໆ"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"ຊື່"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"ເປີດ"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"ປິດ"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"ປິດການນຳໃຊ້"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"ອະນຸຍາດໃຫ້ແລກປ່ຽນຂໍ້ມູນເມື່ອນຳແທັບເລັດ ໄປແຕະໃສ່ອຸປະກອນອື່ນ"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"ອະນຸຍາດໃຫ້ມີການແລກປ່ຽນຂໍ້ມູນເມື່ອ ໂທລະສັບແຕະກັບອຸປະກອນອື່ນ"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"ແລ້ວໆ"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"ການກວດສອບຕິດຕາມເຄືອຂ່າຍ"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"ອຸປະກອນນີ້ຖືກຈັດການໂດຍ:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nຜູ່ເບິ່ງແຍງລະບົບຂອງທ່ານສາມາດ ຕິດຕາມການເຄື່ອນໄຫວໃນເຄືອຂ່າຍ ຮວມເຖິງອີເມວ, ແອັບຯ ແລະ ເວັບໄຊຕ່າງໆທີ່ປອດໄພ.\n\nສຳລັບຂໍ້ມູນເພີ່ມເຕີມ, ກະລຸນາຕິດຕໍ່ຜູ່ເບິ່ງແຍງລະບົບຂອງທ່ານ."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"ບຸກຄົນທີສາມສາມາດກວດສອບຕິດຕາມເຄືອຂ່າຍຂອງທ່ານ\nຮວມທັງ: ອີເມວ, ແອັບຯ ແລະເວັບໄຊທີ່ເຂົ້າລະຫັດຕ່າງໆ.\n\nຂໍ້ມູນພິສູດຢືນຢັນທີ່ເຊື່ອຖືໄດ້ທີ່ມີຕິດຕັ້ງໃນອຸປະກອນຂອງທ່ານ ເຮັດໃຫ້ຂັ້ນຕອນນີ້ດຳເນີນໄປໄດ້."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"ພາກສ່ວນທີສາມສາມາດເບິ່ງການເຄື່ອນໄຫວເຄືອຂ່າຍຂອງທ່ານໄດ້ ຮວມເຖິງອີເມວ, ແອັບຯ ແລະເວັບໄຊທີ່ເຂົ້າລະຫັດ.\n\nຂໍ້ມູນການຢືນຢັນທີ່ເຊື່ອຖືໄດ້ໃນຄອມພິວເຕີຂອງທ່ານ ອະນຸມັດໃຫ້ຂັ້ນຕອນນີ້ເປັນໄປໄດ້."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"ກວດສອບການພິສູດຢືນຢັນທີ່ເຊື່ອຖືໄດ້"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"ຜູ່ໃຊ້"</string>
     <string name="user_list_title" msgid="7937158411137563543">"ຜູ່ໃຊ້ &amp; ໂປຣໄຟລ໌"</string>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 85b710c..acd79c8 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Prievado laukas turi būti tuščias, jei tuščias prieglobos laukas."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Prievadas, kurį įvedėte, netinkamas."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP įgaliotąjį serverį naudoja naršyklė, bet jo negali naudoti kitos programos."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Vieta:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Šalia esantis CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Mob. tel. informacija:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kaip kalbėtojo telefonas"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Muzikai ir medijai"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Atsiminti nustatymus"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Belaidis rodymas"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Jei norite matyti įrenginius, įjunkite belaidį rodymą."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Belaidžio ryšio pateiktis neleidžiama, nes „Wi-Fi“ išjungta."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Ieškoti pateikčių"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Ieškoma…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Nerasta belaidžio ryšio pateikčių netol."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Susietos pateiktys"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Pasiekiami įrenginiai"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Įgalinti belaidį rodymą"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nerasta netoliese esančių įrenginių."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Jungiama"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Prijungta"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Pasiekiama"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Naudojama"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Nepasiekiamas"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Pateikties nustatymai"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Atsijungti?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Tai nutrauks ryšį su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Belaidžio rodymo parinktys"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Pamiršti"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Atlikta"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Pavadinimas"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Įjungta"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Išjungta"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Neleidžiama"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Leisti keistis duomenimis, kai planšetinis kompiuteris aptinka kitą įrenginį"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Leisti keistis duomenimis, kai telefonas paliečia kitą įrenginį"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Atlikta"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Tinklo stebėjimas"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Šį įrenginį tvarko:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nAdministratorius gali stebėti jūsų veiklą tinkle, įskaitant el. laiškus, programas ir saugias svetaines.\n\nJei reikia daugiau informacijos, susisiekite su administratoriumi."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Trečioji šalis gali stebėti jūsų tinklo\nveiklą, įskaitant el. paštą, programas ir saugias svetaines.\n\nVisa tai galima dėl įrenginyje įdiegtų patikimų prisijungimo duomenų."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Trečioji šalis gali stebėti jūsų tinklo veiklą, įskaitant el. laiškus, programas ir saugias svetaines.\n\nVisa tai galima dėl įrenginyje įdiegtų patikimų prisijungimo duomenų."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Tikrinti patikimus prisijungimo duomenis"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Naudotojai"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Naudotojai ir profiliai"</string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 3c68288..c388d37 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ja saimniekdatora lauks ir tukšs, porta laukam jābūt tukšam."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Ierakstītais porta numurs nav derīgs."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP starpniekserveris tiek izmantots pārlūkprogrammā, taču, iespējams, netiek izmantots citās lietotnēs."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Atrašanās vieta:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Tuvējais CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Tālruņa atrašanās vietas informācija:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kā mikrofons ar skaļruni"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Mūzikai un multividei"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Iegaumēt iestatījumus"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Bezvadu attēlošana"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Lai skatītu ierīces, ieslēdziet bezvadu attēlošanu."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Bezvadu displejs ir atspējots, jo Wi-Fi savienojums ir izslēgts."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Meklēt displejus"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Notiek meklēšana..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Tuvumā netika atrasti bezvadu displeji."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Pārī savienoti displeji"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Pieejamās ierīces"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Bezvadu attēlošanas iespējošana"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Tuvumā nav atrasta neviena ierīce."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Notiek savienojuma izveide."</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Pievienotas"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Pieejamas"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Tiek lietota"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Nav pieejama"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Displeja iestatījumi"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Vai pārtraukt savienojumu?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Tiks pārtraukts savienojums ar:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Bezvadu attēlošanas opcijas"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Aizmirst"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Gatavs"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nosaukums"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Ieslēgts"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Izslēgts"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Atspējots"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Atļaut datu apmaiņu, kad planšetdators saskaras ar citu ierīci"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Atļaut datu apmaiņu, kad tālrunis saskaras ar citu ierīci"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Gatavs"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Tīkla pārraudzība"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Šī ierīce tiek pārvaldīta šādā domēnā:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nJūsu administrators var pārraudzīt jūsu tīkla darbību, tostarp e-pasta ziņojumus, lietotnes un drošas vietnes.\n\nLai iegūtu plašāku informāciju, sazinieties ar savu administratoru."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Trešā puse var pārraudzīt darbības, ko veicat tīklā,\ntostarp e-pasta ziņojumus, lietotnes un drošās vietnes.\n\nTas ir iespējams, jo jūsu ierīcē ir instalēti uzticami akreditācijas dati."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Trešā puse spēj pārraudzīt jūsu darbības tīklā, tostarp e-pastu, lietotnes un drošās vietnes.\n\nŠo pārraudzības iespēju nodrošina jūsu ierīcē instalēts sertifikāts."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Pārbaudīt uzticamos akreditācijas datus"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Lietotāji"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Lietotāji un profili"</string>

diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 0d4b1b2..f2d97ec 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml

@@ -199,6 +199,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 проксиг хөтөч ашиглаж байгаа боловч бусад апп-ууд ашиглахгүй байж магадгүй."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Байршил"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Хөрш CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Үүрийн мэдээлэл:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Чанга яригч утсаар"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Хөгжим болон медианд зориулсан"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Тохиргоог сануулах"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Утасгүй дэлгэц"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Төхөөрөмжүүдийг харахын тулд утасгүй дэлгэцийг асаана уу."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Wi-Fi хаалттай байгаа учир утасгүй дэлгэцийг идэвхгүйжүүлсэн."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Дэлгэц хайх"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Хайж байна..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Ойролцоо утасгүй дэлгэц олдсонгүй."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Хослуулсан дэлгэцүүд"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Боломжит төхөөрөмжүүд"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Утасгүй дэлгэцийг идэвхжүүлэх"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Ойролцоо төхөөрөмж олдсонгүй."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Холбогдож байна"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Холбогдсон"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Боломжтой"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Ашиглаж байгаа"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Байхгүй"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Дэлгэцийн тохиргоо"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Салгах уу?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Энэ таныг дараах холболтоос салгах болно:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Утасгүй дэлгэцний тохируулга"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Мартах"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Дууссан"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Нэр"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Идэвхтэй"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Идэвхгүй"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Идэвхгүйжүүлсэн"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Таблет өөр төхөөрөмжид хүрэх үед өгөгдөл солилцохыг зөвшөөрөх"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Утас өөр төхөөрөмжид хүрэх үед өгөгдөл солилцохыг зөвшөөрөх"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Дууссан"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Сүлжээний хяналт"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Энэ төхөөрөмжийг \n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n удирдаж байна\nТанай админ имэйл, апп болон аюулгүй вебсайтууд гэх мэтийг оруулан таны сүлжээний үйл ажиллагааг хянах боломжтой.\n\nДэлгэрэнгүй мэдээллийг админтайгаа холбогдож авна уу."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Гуравдагч талын этгээд таны сүлжээг хянаж байж болзошгүй\nүүнд имэйл, апп-ууд болон аюулгүй вебсайтууд багтана.\n\nТаны төхөөрөмж дээр суулгасан итгэмжлэгдсэн жуух энэ боломжоор хангаж байна."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Гуравдагч талын этгээд таны имэйл, апп-ууд болон аюулгүй вебсайтууд гэх мэтийг оруулан таны сүлжээний үйл ажиллагааг хянах боломжтой.\n\nТаны төхөөрөмж дээр суулгасан итгэмжлэгдсэн жуухын тусламжтайгаар ингэх боломжтой."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Итгэмжлэгдсэн жуухуудыг шалгах"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Хэрэглэгчид"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Хэрэглэгчид &amp; профайлууд"</string>

diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 6d12c66..54951e5 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Medan port haruslah kosong sekiranya medan hos kosong."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Port yang anda taipkan tidak sah."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi HTTP digunakan oleh penyemak imbas tetapi tidak boleh digunakan oleh aplikasi lain."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasi:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID berdekatan:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Info Sel:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sebagai telefon pembesar suara"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Untuk muzik dan media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat tetapan"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Paparan wayarles"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Untuk melihat peranti, hidupkan paparan wayarles."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Paparan wayarles dilumpuhkan kerana Wi-Fi dimatikan."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Carian untuk paparan"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Mencari..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Tiada paparan wayarles berhampiran ditemui."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Paparan berpasangan"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Peranti tersedia"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Dayakan paparan wayarles"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Tiada peranti berdekatan ditemui."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Menyambung"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Bersambung"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Tersedia"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Sedang digunakan"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Tiada"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Tetapan paparan"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Putuskan sambungan WiFi?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Ini akan menamatkan sambungan anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Pilihan paparan wayarles"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Lupakan"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Selesai"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nama"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Hidup"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Matikan"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Dilumpuhkan"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Benarkan pertukaran data apabila tablet menyentuh peranti lain"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Benarkan pertukaran data apabila telefon menyentuh peranti lain"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Selesai"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Pemantauan rangkaian"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Peranti ini diuruskan oleh:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nPentadbir anda boleh mengawasi aktiviti rangkaian anda, termasuk e-mel, apl dan tapak web selamat.\n\nUntuk maklumat lanjut, hubungi pentadbir anda."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Pihak ketiga boleh memantau aktiviti\nrangkaian anda, termasuk e-mel, apl dan tapak web selamat.\n\nBukti kelayakan dipercayai yang dipasang pada peranti anda membolehkan perkara ini."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Pihak ketiga berkeupayaan untuk memantau aktiviti rangkaian anda, termasuk e-mel, apl dan tapak web selamat.\n\nBukti kelayakan dipercayai yang dipasang pada peranti anda yang membolehkan perkara ini."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Semak bukti kelayakan dipercayai"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Pengguna"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Pengguna &amp; profil"</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9cd8f4b..74f6599 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Feltet for portnummer må være tomt om feltet for vertsnavn er tomt."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Angitt port er ikke gyldig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-mellomtjeneren brukes av nettleseren, men kan ikke brukes av andre apper."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC-nettadresse: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posisjon:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Celleinfo:"</string>
@@ -484,7 +485,7 @@
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra medielyd."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra håndfrilyd."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra inndataenheten."</string>
-    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Internett-tilgang via <xliff:g id="DEVICE_NAME">%1$s</xliff:g> vil bli frakoblet."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Internett-tilgang via <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kommer til å avbrytes."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vil bli koblet fra delingen av nettbrettets Internett-tilkobling."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vil bli koblet fra delingen av telefonens Internett-tilkobling."</string>
     <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Tilkoblet Bluetooth-enhet"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som høyttalertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For musikk og medier"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk innstillinger"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Trådløs skjerm"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Slå på trådløs skjerm for å kunne se enheter."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Trådløs skjerm er deaktivert fordi Wi-Fi er slått av."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Søk etter skjermer"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Søker …"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Fant ikke trådløse skjermer i nærheten."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Skjermer koblet sammen"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Tilgjengelige enheter"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktiver trådløs skjermdeling"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Finner ingen enheter i nærheten."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Kobler til"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Tilkoblet"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Tilgjengelig"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"I bruk"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Utilgjengelig"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Skjerminnstillinger"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Vil du koble fra?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Dette avslutter tilkoblingen med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Alternativer for trådløs skjerm"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Glem"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Ferdig"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Navn"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"På"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Av"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Deaktivert"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillat datautveksling når nettbrettet berører en annen enhet"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Tillat utveksling av data når telefonen berører en annen enhet"</string>
@@ -1006,7 +998,7 @@
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Koble deg til Internett"</string>
     <string name="location_title" msgid="1029961368397484576">"Min posisjon"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
-    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Høy nøyaktighet"</string>
+    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Stor nøyaktighet"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterisparing"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Bare for enheter"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Posisjon deaktivert"</string>
@@ -1534,7 +1526,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Prøv å koble til en annen Bluetooth-enhet"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"Batteri brukt av app"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Stopp eller avinstaller appen"</string>
-    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Velg strømsparingsmodus"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Velg batterisparingsmodus"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Appen kan ha innstillinger som kan redusere batteribruken"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batteri brukt av brukeren"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden strømmen ble frakoblet"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Ferdig"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Nettverksovervåking"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Denne enheten administreres av:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nAdministratoren din kan overvåke nettverksaktiviteten din, inkludert e-poster, apper og sikre nettsteder.\n\nFor mer informasjon kan du kontakte administratoren din."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"En tredjepart kan overvåke nettverksaktiviteten din\n, inkludert e-post, apper og sikre nettsteder.\n\nEn installasjon av pålitelig legitimasjon på enheten din gjør dette mulig."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"En utenforstående kan overvåke nettverksaktiviteten din, inkludert e-poster, apper og sikre nettsteder.\n\nPålitelig legitimasjon, som er installert på enheten din, gjør dette mulig."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Sjekk pålitelig legitimasjon"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Brukere"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Brukere og profiler"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5ff8eda..b8deb80 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Het poortveld moet leeg zijn als het hostveld leeg is."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"De poort die u heeft ingevoerd, is ongeldig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"De HTTP-proxy wordt gebruikt door de browser, maar mag niet worden gebruikt door de andere apps."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Locatie:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naburige CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Celinfo:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Als luidsprekertelefoon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Voor muziek en media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Instellingen onthouden"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Draadloze weergave"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Als u apparaten wilt zien, schakelt u draadloze weergave in."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Draadloze weergave wordt uitgeschakeld omdat wifi is uitgeschakeld."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Zoeken naar displays"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Zoeken…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Geen draadloze displays in de buurt."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Gekoppelde displays"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Beschikbare apparaten"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Draadloze weergave inschakelen"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Geen apparaten in de buurt gevonden."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Verbinding maken"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Verbonden"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Beschikbaar"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In gebruik"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Niet beschikbaar"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Weergave-instellingen"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Ontkoppelen?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Hierdoor wordt uw verbinding met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; verbroken"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Opties voor draadloze weergave"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Vergeten"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Gereed"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Naam"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Aan"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Uit"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Uitgeschakeld"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Gegevensuitwisseling toestaan wanneer de tablet een ander apparaat fysiek raakt"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Gegevensuitwisseling toestaan wanneer de telefoon een ander apparaat fysiek raakt"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Gereed"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Netwerkcontrole"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Dit apparaat wordt beheerd door:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nUw beheerder kan uw netwerkactiviteit bijhouden, waaronder e-mails, apps en beveiligde websites.\n\nNeem voor meer informatie contact op met uw beheerder."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Een derde partij kan uw netwerkactiviteit\ncontroleren, waaronder e-mails, apps en beveiligde websites.\n\nDit wordt mogelijk gemaakt door vertrouwde inloggegevens die zijn geïnstalleerd op uw apparaat."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Een derde partij kan uw netwerkactiviteit, waaronder e-mails, apps en beveiligde websites, bijhouden.\n\nEen vertrouwde referentie die is geïnstalleerd op uw apparaat, maakt dit mogelijk."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Vertrouwde inloggegevens controleren"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Gebruikers"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Gebruikers en profielen"</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 72e00fd..081cd9d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pole port musi być puste, jeśli pole host jest puste."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Wpisany port jest nieprawidłowy."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Serwer proxy HTTP jest używany przez przeglądarkę, ale inne aplikacje mogą go nie używać."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"Adres URL pliku PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokalizacja:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Sąsiadujący CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informacje:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon w trybie głośnika"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Dla muzyki i multimediów"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamiętaj ustawienia"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Wyświetlacz bezprzewodowy"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Aby zobaczyć urządzenia, włącz wyświetlacz bezprzewodowy."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Wyświetlacz bezprzewodowy jest wyłączony, ponieważ wyłączone jest Wi-Fi."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Wyszukaj wyświetlacze"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Wyszukuję…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Nie znaleziono wyświetlaczy bezprzewodowych w pobliżu."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Sparowane wyświetlacze"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dostępne urządzenia"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Włącz wyświetlacz bezprzewodowy"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Brak urządzeń w pobliżu."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Łączenie"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Połączony"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Dostępny"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"W użyciu"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Niedostępne"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Ustawienia wyświetlacza"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Rozłączyć?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Spowoduje to zakończenie połączenia z:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Opcje wyświetlacza bezprzewodowego"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Zapomnij"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Gotowe"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nazwa"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Wł."</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Wył."</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Wyłączona"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"Komunikacja NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Zezwalaj na wymianę danych, gdy tablet dotyka innego urządzenia"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Zezwalaj na wymianę danych, gdy telefon dotyka innego urządzenia."</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Gotowe"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Monitorowanie sieci"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"To urządzenie jest zarządzane w domenie:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nAdministrator może monitorować Twoją aktywność w sieci, w tym e-maile, aplikacje i bezpieczne witryny.\n\nSkontaktuj się z nim, by dowiedzieć się więcej."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Firma zewnętrzna może monitorować Twoją aktywność w sieci,\nw tym e-maile, aplikacje i bezpieczne witryny.\n\nPozwalają na to zaufane dane uwierzytelniające zainstalowane na tym urządzeniu."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Podmiot zewnętrzny może monitorować Twoją aktywność w sieci (np. e-maile, aplikacje i bezpieczne strony).\n\nUmożliwiają to dane uwierzytelniające zainstalowane na Twoim urządzeniu."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Sprawdź zaufane dane uwierzytelniające"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Użytkownicy"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Użytkownicy i profile"</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e83ad1c..5b51422 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"O campo referente à porta tem de estar vazio se o campo do anfitrião estiver vazio."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"A porta introduzida não é válida."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"O proxy HTTP é utilizado pelo navegador, mas não pode ser utilizado por outras aplicações."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL de PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Local:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vizinho"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como telefone com altifalante"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Memorizar definições"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Visualização sem fios"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Para ver os dispositivos, ative a visualização sem fios."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"A visualização sem fios está desativada porque o Wi-Fi está desligado."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Pesquisar ecrãs"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"A pesquisar..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Não foram encont. ecrãs sem fios próx."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Ecrãs sincronizados"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dispositivos disponíveis"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ativar display sem fios"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nenhum dispositivo nas proximidades."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"A ligar"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Ligado"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponível"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Em utilização"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Indisponível"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Definições de visualização"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Desligar?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Isto terminará a sua ligação com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Opções de visualização sem fios"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Esquecer"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Concluído"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Ligado"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Desligado"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Desativado"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir a troca de dados quando o tablet toca noutro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir a troca de dados quando o telefone toca outro aparelho"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Concluído"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Monitorização da rede"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Este dispositivo é gerido por:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nO seu administrador pode monitorizar a sua atividade de rede, incluindo emails, aplicações e Websites protegidos.\n\nPara mais informações, contacte o seu administrador."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"A sua atividade\nde rede, incluindo mensagens de email, aplicações e Websites seguros, pode ser monitorizada por terceiros.\n\nEsta situação é possível graças a uma credencial fidedigna instalada no seu dispositivo."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"A sua atividade de rede, incluindo emails, aplicações e Websites seguros, pode ser monitorizada por terceiros.\n\nIsto é possível através de uma credencial fidedigna instalada no seu dispositivo."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Verificar credenciais fidedignas"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Utilizadores"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Utilizadores e perfis"</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4e918f2..826be01 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"O campo da porta deverá estar vazio se o campo do host estiver vazio."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"A porta digitada não é válida."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"O proxy HTTP é usado pelo navegador, mas não pode ser usado por outros aplicativos."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL do PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Localização:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vizinho:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como viva-voz"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e mídia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configurações"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Display sem fio"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Para ver os dispositivos, ative o Display sem fio."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"A visualização sem fio está desativada, pois o Wi-Fi está desligado."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Procurar displays"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Procurando..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Nenhum display sem fio foi encontrado."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Displays pareados"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dispositivos disponíveis"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ativar Display sem fio"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nenhum dispositivo próximo encontrado."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectado"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponível"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Em uso"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Indisponível"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Configurações do display"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Desconectar?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Isso encerrará sua conexão com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Opções de Display sem fio"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Esquecer"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Concluído"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Ligado"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Desligado"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Desativado"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir troca de dados quando o tablet tocar em outro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir troca de dados quando o telefone tocar em  outro dispositivo"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Concluído"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Monitoramento de rede"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Este dispositivo é gerenciado por:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nO administrador pode monitorar suas atividades na rede, incluindo e-mails, aplicativos e websites seguros.\n\nPara mais informações, entre em contato com o administrador."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Sua atividade na rede, incluindo e-mails, aplicativos\ne websites seguros, pode ser monitorada por terceiros.\n\nUma credencial confiável instalada no dispositivo permite o monitoramento."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Sua atividade na rede, incluindo e-mails, aplicativos e websites seguros, pode ser monitorada por terceiros.\n\nUma credencial confiável instalada no dispositivo permite isso."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Verificar credenciais confiáveis"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Usuários"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Usuários e perfis"</string>

diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 5400d34..8c4655d 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml

@@ -278,6 +278,8 @@
     <skip />
     <!-- no translation found for proxy_warning_limited_support (7229337138062837422) -->
     <skip />
+    <!-- no translation found for proxy_url (2523518669129974654) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posiziun:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vischin:"</string>
     <!-- no translation found for radio_info_cellinfo_label (1300937728020622362) -->
@@ -745,36 +747,22 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sco telefon ad autpledader"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per musica e multimedia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Memorisar ils parameters"</string>
-    <!-- no translation found for wifi_display_settings_title (564299108014609382) -->
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
     <skip />
-    <!-- no translation found for wifi_display_settings_empty_list_wifi_display_off (1225626898926363100) -->
+    <!-- no translation found for wifi_display_enable_menu_item (4883036464138167674) -->
     <skip />
-    <!-- no translation found for wifi_display_settings_empty_list_wifi_display_disabled (1336244693183075466) -->
-    <skip />
-    <!-- no translation found for wifi_display_search_for_devices (5065526281193354502) -->
-    <skip />
-    <!-- no translation found for wifi_display_searching_for_devices (5172373825348672137) -->
-    <skip />
-    <!-- no translation found for wifi_display_no_devices_found (8180582698282377626) -->
-    <skip />
-    <!-- no translation found for wifi_display_paired_devices (7395326840730024303) -->
-    <skip />
-    <!-- no translation found for wifi_display_available_devices (4558314642853513487) -->
+    <!-- no translation found for wifi_display_no_devices_found (1382012407154143453) -->
     <skip />
     <!-- no translation found for wifi_display_status_connecting (5688608834000748607) -->
     <skip />
     <!-- no translation found for wifi_display_status_connected (8364125226376985558) -->
     <skip />
-    <!-- no translation found for wifi_display_status_available (1924167525172207067) -->
-    <skip />
     <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
     <skip />
+    <!-- no translation found for wifi_display_status_not_available (5714978725794210102) -->
+    <skip />
     <!-- no translation found for wifi_display_details (7791118209992162698) -->
     <skip />
-    <!-- no translation found for wifi_display_disconnect_title (1543715924639003599) -->
-    <skip />
-    <!-- no translation found for wifi_display_disconnect_text (4824860802264489088) -->
-    <skip />
     <!-- no translation found for wifi_display_options_title (5740656401635054838) -->
     <skip />
     <!-- no translation found for wifi_display_options_forget (9119048225398894580) -->
@@ -783,12 +771,6 @@
     <skip />
     <!-- no translation found for wifi_display_options_name (4756080222307467898) -->
     <skip />
-    <!-- no translation found for wifi_display_summary_on (3695429596604962531) -->
-    <skip />
-    <!-- no translation found for wifi_display_summary_off (2445210133184740611) -->
-    <skip />
-    <!-- no translation found for wifi_display_summary_disabled (5318394806146587849) -->
-    <skip />
     <!-- no translation found for nfc_quick_toggle_title (6769159366307299004) -->
     <skip />
     <!-- no translation found for nfc_quick_toggle_summary (8302974395787498915) -->
@@ -3194,7 +3176,7 @@
     <skip />
     <!-- no translation found for ssl_ca_cert_info_message (4583879256548819713) -->
     <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <!-- no translation found for ssl_ca_cert_warning_message (8216218659139190498) -->
     <skip />
     <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
     <skip />

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 48d771c..8013ad1 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Câmpul pentru port trebuie să fie necompletat în situaţia în care câmpul pentru gazdă este necompletat."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Portul introdus nu este valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy-ul HTTP este utilizat de browser, dar nu poate fi utilizat de alte aplicaţii."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"Adresa URL a fișierului PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Locaţie:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vecin:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informaţii celulă:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ca difuzor"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pentru muzică şi fişiere media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Reţineţi setările"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Ecran wireless"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Pentru a vedea gadgeturi, activați ecranul wireless."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Ecranul wireless este dezactivat, deoarece rețeaua Wi-Fi este oprită."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Căutaţi afişaje"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Se caută…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Nu există afişaje wireless în apropiere."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Afişaje împerecheate"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dispozitive disponibile"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activați ecranul wireless"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nu s-au găsit dispozitive în apropiere."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Se conectează"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectat"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponibil"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Se utilizează"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Indisponibil"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Setări de afişare"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Deconectaţi?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Această acţiune va încheia conexiunea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Opțiuni pentru ecrane wireless"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Eliminaţi"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Terminat"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nume"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Pornit"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Oprit"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Dezactivat"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permiteţi schimbul de date atunci când tableta atinge alt dispozitiv"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permiteţi schimbul de date atunci când telefonul atinge alt dispozitiv"</string>
@@ -1962,7 +1954,7 @@
     <string name="done_button" msgid="1991471253042622230">"Terminat"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Monitorizarea rețelei"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Acest dispozitiv este administrat de:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nAdministratorul poate să monitorizeze activitatea dvs. în rețea, inclusiv mesajele e-mail, aplicațiile și site-urile securizate.\n\nPentru mai multe informații, contactați administratorul."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"O terță parte poate monitoriza activitatea dvs. în\nrețea, inclusiv mesajele de e-mail, aplicațiile și site-urile securizate.\n\nAcest lucru este posibil deoarece există o acreditare de încredere instalată pe dispozitivul dvs."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"O terță parte vă poate monitoriza activitatea în rețea, inclusiv e-mailurile, aplicațiile și site-urile securizate.\n\nAcest lucru este posibil datorită unui certificat de încredere instalat pe dispozitivul dvs."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Verificați acreditările de încredere"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Utilizatori"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Utilizatori și profiluri"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c057830..24c438a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -199,6 +199,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 используется браузером, но недоступен для других приложений."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL файла автоконфигурации прокси-сервера: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Местоположение:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Соседний CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Индекс сети:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Для громкой связи"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Для музыки и мультимедиа"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомнить настройки"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Беспроводной монитор"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Чтобы просмотреть список устройств, включите беспроводной проектор."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Функция отключена, т. к. нет Wi-Fi-соединения."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Поиск"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Поиск…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Беспроводные мониторы не обнаружены"</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Сопряженные экраны"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Доступные устройства"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Включить беспроводной дисплей"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Устройства не найдены"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Подключение…"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Подключен"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Доступен"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Используется"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Недоступен"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Настройки экрана"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Отключиться?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Произойдет разъединение с устройством&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Настройки беспроводного проектора"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Удалить"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Готово"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Название"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Включен"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Выключен"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Отключен"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Разрешить обмен данными при совмещении планшета с другим устройством"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Разрешить обмен данными при совмещении телефона с другим устройством"</string>
@@ -1963,7 +1955,7 @@
     <string name="done_button" msgid="1991471253042622230">"Готово"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Мониторинг сети"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Устройство зарегистрировано в домене \n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>.\n\nАдминистратор может отслеживать ваши действия в интернет-сервисах, включая электронную почту, приложения и защищенные веб-сайты.\n\nЗа дополнительной информацией обращайтесь к администратору."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Администратор может отслеживать ваши действия в сети.\nНапример, он может просматривать ваши письма, приложения и список посещенных сайтов.\n\nЭто возможно благодаря надежному сертификату, установленному на устройстве."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Третья сторона может отслеживать ваши действия в сети. (например, просматривать ваши письма, приложения и список посещенных сайтов).\n\nЭто возможно благодаря надежному сертификату, установленному на устройстве."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Настройки сертификатов"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Пользователи"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Пользователи и профили"</string>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 53af28e..d5c8baf 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ak je pole hostiteľ prázdne, musí byť prázdne aj pole port."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Zadaný port nie je platný."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Prehliadač používa server proxy pre protokol HTTP, ale ostatné aplikácie ho používať nemusia."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"Adresa URL PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Poloha:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susedný identifikátor CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ako reproduktor telefónu"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pre hudbu a médiá"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamätať nastavenia"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Bezdrôtový displej"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Ak chcete zobraziť zariadenia, zapnite bezdrôtový displej."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Bezdrôtový displej je zakázaný, pretože je vypnuté pripojenie Wi-Fi."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Vyhľadávať displeje"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Vyhľadávanie..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"V blízkosti sa nenašli žiadne displeje s bezdrôtovým pripojením."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Spárované displeje"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dostupné zariadenia"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Povoliť bezdrôtový displej"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"V okolí sa nenašli žiadne zariadenia."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Prepája sa"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Pripojené"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"K dispozícii"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Používa sa"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Nie je k dispozícii"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Nastavenia obrazovky"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Odpojiť?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Táto akcia ukončí vaše pripojenie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Možnosti bezdrôtového displeja"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Odstrániť"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Hotovo"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Názov"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Zapnuté"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Vypnuté"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Zakázané"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Povoliť výmenu údajov, ak sa tablet dotýka iného zariadenia"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Povoliť výmenu údajov, ak sa telefón dotýka iného zariadenia"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Hotovo"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Monitorovanie siete"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Toto zariadenie je spravované nasledujúcou doménou:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nSprávca môže monitorovať vašu aktivitu v sieti vrátane e-mailov, aplikácií a zabezpečených webových stránok.\n\nAk chcete získať viac informácií, kontaktujte svojho správcu."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Tretia strana môže monitorovať vašu aktivitu\nv sieti vrátane e-mailov, aplikácií a zabezpečených webových stránok.\n\nUmožňuje to dôveryhodné poverenie nainštalované vo vašom zariadení."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Vaša aktivita v sieti, vrátane e-mailov, aplikácií a zabezpečených webových stránok môže byť monitorovaná treťou stranou.\n\nUmožňujú to dôveryhodné identifikačné údaje nainštalované vo vašom zariadení."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Skontrolovať dôveryhodné poverenia"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Používatelia"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Používatelia a profily"</string>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 16a44a2..709380a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Če je polje za gostitelja prazno, mora biti prazno tudi polje za vrata."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Vtipkana številka vrat je neveljavna."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP lahko uporablja brskalnik, drugi programi pa ne."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL datoteke PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID v bližini:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Podatki o celici:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kot zvočnik"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za glasbo in predstavnost"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapomni si nastavitve"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Prikaz brezžičnih naprav"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Če si želite ogledati naprave, vklopite brezžično povezavo."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Prikaz brezžičnih naprav je onemogočen, ker je Wi-Fi izklopljen."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Iskanje naprav"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Iskanje ..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"V bližini ni brezžičnih naprav."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Seznanjene naprave"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Razpoložljive naprave"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Omogočanje brezžičnega zaslona"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"V bližini ni naprav."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Povezovanje"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Povezane"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Na voljo"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"V uporabi"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Ni na voljo"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Nastavitve naprave"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Želite prekiniti povezavo?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"S tem bo prekinjena povezava z napravo:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Možnosti prikaza brezžičnih naprav"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Pozabi"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Končano"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Ime"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Vklopljeno"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Izklopljeno"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Onemogočeno"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Dovoli izmenjavo podatkov, ko se tablični računalnik dotakne druge naprave"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Dovoli izmenjavo podatkov, ko se telefon dotakne druge naprave"</string>
@@ -1534,7 +1526,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Poskusite vzpostaviti povezavo z drugo napravo Bluetooth"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"Energija, ki jo je porabil program"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Ustavi ali odstrani program"</string>
-    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Izberite način za varčevanje z energijo"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Izberite način za varčevanje z energijo akumulatorja"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Program morda omogoča nastavitve za zmanjšanje porabe energije"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Energija, ki jo je porabil uporabnik"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odklopa"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Končano"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Nadzor omrežja"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"To napravo upravlja:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nSkrbnik lahko nadzira vašo dejavnost v omrežju, vključno z e-pošto, aplikacijami in varnimi spletnimi mesti.\n\nČe želite več informacij, se obrnite na skrbnika."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Vašo omrežno dejavnost, vključno z e-pošto, aplikacijami\nin varnimi spletnimi mesti, lahko nadzira tretja oseba.\n\nTo omogoča zaupanja vredna poverilnica, nameščena v vaši napravi."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Tretja oseba lahko nadzira vašo omrežno dejavnost, vključno z e-poštnimi sporočili, aplikacijami in varnimi spletnimi mesti.\n\nTo ji omogoča zaupanja vredna poverilnica, ki je nameščena v vaši napravi."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Preveri zaupanja vredne poverilnice"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Uporabniki"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Uporabniki in profili"</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c133906..e469ba5 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -199,6 +199,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 прокси, али друге апликације не могу да га користе."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</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>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Као звучник телефона"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"За музику и медије"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запамти подешавања"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Бежични екран"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Да бисте видели уређаје, укључите бежични екран."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Бежични екран је онемогућен јер је Wi-Fi искључен."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Тражење екрана"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Претраживање..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Нису пронађени бежични екрани у близини."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Упарени екрани"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Доступни уређаји"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Омогућавање бежичног приказа"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Нема уређаја у близини."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Повезивање"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Повезан"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Доступан"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"У употреби"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Недоступан"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Подешавања екрана"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Желите ли да прекинете везу?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Овим ћете прекинути везу са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Опције бежичног екрана"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Заборави"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Готово"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Назив"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Укључен"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Искључен"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Онемогућен"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Омогућавање размене података када таблет додирне други уређај"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Омогућавање размене података када телефон додирне други уређај"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Готово"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Надгледање мреже"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Овим уређајем управља:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nАдминистратор може да надгледа мрежне активности, укључујући поруке е-поште, апликације и безбедне веб-сајтове.\n\nВише информација потражите од администратора."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Трећа страна може да надгледа активности\nна мрежи, укључујући поруке е-поште, апликације и безбедне веб-сајтове.\n\nТо је могуће захваљујући поузданом акредитиву инсталираном на уређају."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Трећа страна може да прати вашу активност на мрежи, укључујући е-пошту, апликације и безбедне веб-сајтове.\n\nТо омогућава поуздани акредитив који је инсталиран на уређају."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Провери поуздане акредитиве"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Корисници"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Корисници и профили"</string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ed92d43..18b535c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portfältet måste vara tomt om värdfältet är tomt."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Porten som du har angett är inte giltig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxyn används av webbläsaren men får inte användas av de andra apparna."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Plats:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Närliggande CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Cellinfo:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som högtalartelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"För musik och media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kom ihåg inställningarna"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Trådlös skärm"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Om du vill visa enheter aktiverar du funktionen så att trådlösa skärmar visas."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Trådlösa enheter visas inte eftersom Wi-Fi är inaktiverat."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Sök efter enheter"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Söker …"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Det gick inte att hitta några enheter."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Parkopplade enheter visas"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Tillgängliga enheter"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktivera Wi-Fi-skärmdelning"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Inga enheter fanns i närheten."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Ansluter"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Anslutna"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Tillgängliga"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Används"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Inte tillgänglig"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Skärminställningar"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Vill du koppla från?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Detta avslutar din anslutning till:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Visningsalternativ för trådlösa skärmar"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Glöm"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Klar"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Namn"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"På"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Av"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Inaktiverat"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillåt datautbyte när surfplattan vidrör en annan enhet"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Tillåt datautbyte när mobilen vidrör en annan enhet"</string>
@@ -1006,8 +998,8 @@
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Anslut till internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Min plats"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Läge"</string>
-    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hög exakthet"</string>
-    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterisparfunktion"</string>
+    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hög precision"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterisparläge"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Endast enhet"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Plats av"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nya platsbegäranden"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Klart"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Nätverksövervakning"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Enheten hanteras av:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nAdministratören kan övervaka din aktivitet på nätverket, inklusive e-post, appar och säkra webbplatser.\n\nKontakta administratören om du vill veta mer."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Dina nätverksaktiviteter kan övervakas av tredje part\n, inklusive e-post, appar och säkra webbplatser.\n\nDetta är möjligt eftersom tillförlitlig autentisering har installerats på enheten."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Din nätverksaktivitet, inklusive e-post, appar och säkra webbplatser, kan övervakas av tredje part.\n\nDetta är möjligt eftersom betrodda autentiseringsuppgifter har installerats på enheten."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Kontrollera tillförlitlig autentisering"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Användare"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Användare och profiler"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 76320ab..be4252f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -201,6 +201,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Sehemu ya mlango sharti iwe wazi iwapo sehemu ya mpangishaji haina chochote"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Lango uliloandika si halali."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi ya HTTP inayotumiwa na kivinjari lakini haiwezi kutumika na programu zingine."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL ya PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Mahali:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID ya ujirani:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Maelezo ya Simu:"</string>
@@ -504,28 +505,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kama simu ya spika"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Kwa muziki na midia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kumbuka mipangilio"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Vifaa visivyotumia waya"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Ili kuona vifaa, washa uonyeshaji bila kutumia waya."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Uonyeshaji pasiwaya umezimwa kwa sababu Wi-Fi imezima."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Tafuta vifaa"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Inatafuta…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Hakuna vifaa visivyotumia waya vilivyopatikana karibu"</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Maonyesho yaliyooanishwa"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Vifaa vinavyopatikana"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Washa kuonyesha skrini bila kutumia waya"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Hakuna vifaa vilivyopatikana karibu."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Inaunganisha"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Vimeunganishwa"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Inapatikana"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Vinavyotumika"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Hakipatikani"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Onyesha mipangilio"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Kata muunganisho?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Hii itaukata muunganisho wako kwa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Chaguo za uonyeshaji bila kutumia waya"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Sahau"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Imekamilika"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Jina"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Imewashwa"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Imezimwa"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Imelemazwa"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Ruhusu ubadilishanaji wa data wakati kompyuta kibao inagusa kifaa kingine"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Ruhusu ubadilishanaji wa data wakati simu inagusa kifaa kingine"</string>
@@ -1955,7 +1947,7 @@
     <string name="done_button" msgid="1991471253042622230">"Nimemaliza"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Ufuatiliaji wa mtandao"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Kifaa hiki kimesimamiwa na:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nMsimamizi wako anaweza kufuatilia shughuli za mtandao wako, ikiwa ni pamoja na barua pepe, programu, na wavuti wa usalama.\n \nKwa maelezo zaidi, wasiliana na msimamizi wako."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Mtu mwingine anaweza kufuatilia shughuli za mtandao wako\n, ikiwa ni pamoja na barua pepe, programu, na wavuti salama.\n\nKitambulisho cha kuaminika kilichosakinishwa kwenye kifaa chako kinafanikisha jambo hili."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Mtu mwingine ana uwezo wa kufuatilia shughuli ya mtandao wako, ikiwa ni pamoja na barua pepe, programu, na tovuti salama. \n\n Kitambulisho cha kuaminika kilichosakinishwa kwenye kifaa chako kinafanikisha hili."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Angalia vitambulisho vya kuaminika"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Watumiaji"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Watumiaji na wasifu"</string>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 15fa564..0ca0ae2 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -199,6 +199,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 มีการใช้งานโดยเบราว์เซอร์ แต่อาจไม่มีการใช้งานโดยแอปพลิเคชันอื่น"</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ตำแหน่ง:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID ใกล้เคียง:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"ข้อมูลเซลล์:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"เป็นลำโพง"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"สำหรับเพลงและสื่อ"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"จำการตั้งค่า"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"จอแสดงผลไร้สาย"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"หากต้องการดูอุปกรณ์ ให้เปิดจอแสดงผลไร้สาย"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"การแสดงผลแบบไร้สายถูกปิดใช้งานเนื่องจาก WiFi ปิดอยู่"</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"ค้นหาอุปกรณ์"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"กำลังค้นหา…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"ไม่พบอุปกรณ์ไร้สายในบริเวณใกล้เคียง"</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"จอแสดงผลที่จับคู่"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"อุปกรณ์ที่มี"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"เปิดใช้การแสดงผลแบบไร้สาย"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ไม่พบอุปกรณ์ในบริเวณใกล้เคียง"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"กำลังเชื่อมต่อ"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"เชื่อมต่อแล้ว"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"มีอยู่"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"กำลังใช้งาน"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"ไม่พร้อมใช้งาน"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"การตั้งค่าการแสดงผล"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"หากต้องการตัดการเชื่อมต่อ"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"การทำเช่นนี้จะยุติการเชื่อมต่อของคุณกับ :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"ตัวเลือกจอแสดงผลไร้สาย"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"ไม่จำ"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"เสร็จสิ้น"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"ชื่อ"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"เปิด"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"ปิด"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"ปิดใช้งานแล้ว"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"อนุญาตให้มีการแลกเปลี่ยนข้อมูลเมื่อแตะแท็บเล็ตกับอุปกรณ์อื่น"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"อนุญาตให้มีการแลกเปลี่ยนข้อมูลเมื่อแตะโทรศัพท์กับอุปกรณ์อื่น"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"เสร็จสิ้น"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"การตรวจสอบเครือข่าย"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"อุปกรณ์นี้ได้รับการจัดการโดย:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nผู้ดูแลระบบสามารถตรวจสอบกิจกรรมในเครือข่ายของคุณ รวมถึงอีเมล แอป และเว็บไซต์ที่ปลอดภัย\n\nสำหรับข้อมูลเพิ่มเติม โปรดติดต่อผู้ดูแลระะบบของคุณ"</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"บุคคลที่สามสามารถตรวจสอบกิจกรรมในเครือข่าย\nของคุณ ซึ่งรวมถึงอีเมล แอป และเว็บไซต์ที่มีการรักษาความปลอดภัย\n\nการดำเนินการนี้เกิดขึ้นได้ด้วยข้อมูลรับรองที่เชื่อถือได้ที่ติดตั้งอยู่ในอุปกรณ์ของคุณ"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"บุคคลที่สามสามารถตรวจสอบกิจกรรมทางเครือข่ายของคุณได้ รวมทั้งอีเมล แอป และเว็บไซต์ที่ปลอดภัย\n\nข้อมูลรับรองที่เชื่อถือได้ที่ติดตั้งในอุปกรณ์ของคุณทำให้การดำเนินการนี้เป็นไปได้"</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"ตรวจสอบข้อมูลรับรองที่เชื่อถือได้"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"ผู้ใช้"</string>
     <string name="user_list_title" msgid="7937158411137563543">"ผู้ใช้และโปรไฟล์"</string>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 2588cca..b295220 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Dapat na walang laman ang field ng port kung walang laman ang field ng host."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Hindi wasto ang port na iyong na-type."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Ang HTTP proxy ay ginagamit ng browser ngunit hindi maaaring gamitin ng iba pang apps."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasyon:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Katabing CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Bilang speaker phone"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para sa musika at media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Tandaan ang mga setting"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Wireless display"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Upang makakita ng mga device, i-on ang wireless display."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Hindi pinagana ang wireless display dahil naka-off ang Wi-Fi."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Maghanap ng display"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Naghahanap…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Walang nakita malapit wireless display."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Mga nakapares na display"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Mga available na device"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"I-enable ang wireless display"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Walang nakitang mga kalapit na device."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Kumokonekta"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Nakakonekta"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Available"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Ginagamit"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Hindi available"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Mga setting ng display"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Magdiskonekta?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Tatapusin nito ang iyong koneksyon sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Mga pagpipilian sa wireless display"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Kalimutan"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Tapos na"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Pangalan"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Naka-on"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Naka-off"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Hindi pinagana"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Payagan ang palitan ng data kapag dumikit ang tablet sa isa pang device"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Payagan ang pagpapalitan ng data kapag nadikit ang telepono sa isa pang device"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Tapos na"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Pagsubaybay sa network"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Ang device na ito ay pinapamahalaan ng:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nMay kakayahan ang iyong administrator na subaybayan ang iyong aktibidad sa network, kasama na ang mga email, apps, at mga secure na website.\n\nPara sa higit pang impormasyon, makipag-ugnayan sa iyong administrator."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"May kakayahan ang isang third party na subaybayan ang iyong gawain sa\nnetwork, kasama ang mga email, apps, at secure na website.\n\nGinagawa itong posible ng isang pinagkakatiwalaang kredensyal na naka-install sa iyong device."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"May kakayahan ang isang third party na subaybayan ang aktibidad ng iyong network, kabilang ang mga email, apps, at mga secure website.\n\nGinagawa itong posible ng isang pinagkakatiwalaang credential na naka-install sa iyong device."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Suriin ang mga pinagkakatiwalaang kredensyal"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Mga User"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Mga user at profile"</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 50939b1..d2ebf6b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ana makine alanı boşsa, bağlantı noktası alanı boş olmalıdır."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Yazdığınız bağlantı noktası geçerli değil."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP proxy\'yi tarayıcı kullanıyor, ancak diğer uygulamalar tarafından kullanılamayabilir."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL\'si: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Konum:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Komşu CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Hücre Bilgileri:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefon hoparlörü olarak"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Müzik ve medya için"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ayarları anımsa"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Kablosuz ekran"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Cihazları görmek için kablosuz ekranı açın."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Kablosuz bağlantı kapalı olduğundan kablosuz ekran devre dışı."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Ekran ara"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Aranıyor…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Yakında kablosuz ekran bulunamadı."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Eşleştirilmiş ekranlar"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Kullanılabilir cihazlar"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Kablosuz görüntülemeyi etkinleştir"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Yakınlarda cihaz bulunamadı."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Bağlanılıyor"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Bağlandı"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Kullanılabilir"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Kullanımda"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Kullanılamıyor"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Ekran ayarları"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Bağlantı kesilsin mi?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Şu cihazla bağlantınız kesilecek:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Kablosuz ekran seçenekleri"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Unut"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Bitti"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Ad"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Açık"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Kapalı"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Devre dışı"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Telefon başka cihaza dokunduğunda veri alışverişine izin ver"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Telefon başka cihaza dokunduğunda veri alışverişine izin ver"</string>
@@ -1534,7 +1526,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Farklı bir Bluetooth cihazına bağlanmaya çalışın"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"Uygulama tarafından kullanılan pil"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Uygulamayı durdur veya yüklemesini kaldır"</string>
-    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Pil tasarruf modunu seçin"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Pil tasarrufu modunu seçin"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Uygulama, pil kullanımını azaltmak için ayarlar önerebilir"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Kullanıcı tarafından harcanan pil miktarı"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Fişten çekildikten itibaren <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Tamamlandı"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Ağ izleme"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Bu cihaz, şu alan adı tarafından yönetiliyor:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nYöneticiniz, e-postalar, uygulamalar ve güvenli web siteleri dahil olmak üzere ağ etkinliğinizi izleme olanağına sahiptir.\n\nDaha fazla bilgi için yöneticinizle bağlantı kurun."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"E-postalarınız, uygulamalarınız ve güvenli web siteleriniz\ndahil olmak üzere ağ etkinliğiniz üçüncü bir tarafça izlenebilir.\n\nCihazınızda yüklü güvenilir kimlik bilgisi bunu mümkün kılmaktadır."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"E-postalarınız, uygulamalarınız ve güvenli web siteleriniz dahil olmak üzere ağ etkinliğiniz üçüncü bir tarafça izlenebilir.\n\nCihazınızda yüklü güvenilir bir kimlik bilgisi bunu mümkün kılmaktadır."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Güvenilen kimlik bilgilerini kontrol et"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Kullanıcılar"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Kullanıcılar ve Profiller"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4dda753..431ecea 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -199,6 +199,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 використовується веб-переглядачем, але не може використовуватися ін. програмами."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL-адреса файлу PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Місцезнах.:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Сусідній CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Інформація про телефон:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Як пристр.гучн.зв’язку"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Для музики та медіа"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запам\'ятати налашт."</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Бездротовий екран"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Щоб переглянути пристрої, увімкніть бездротовий екран."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Бездротовий екран вимкнено, оскільки вимкнено Wi-Fi."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Пошук пристроїв"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Пошук…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Бездротові пристрої поблизу не знайдено."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Спарені пристрої"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Доступні пристрої"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Увімкнути бездротовий екран"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Не знайдено пристроїв поблизу."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Під’єднуються"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Під’єднані"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Доступні"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Використовується"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Недоступно"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Налаштування відображення"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Від’єднатися?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Це призведе до роз’єднання з пристроєм:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Параметри бездротового екрана"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Ігнорувати"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Готово"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Назва"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Увімкнено"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Вимкнено"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Вимкнено"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Дозволити обмін даними, коли планшетний ПК торкнеться іншого пристрою"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Дозволити обмін даними, коли телефон торкнеться іншого пристрою"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Готово"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Відстеження мережі"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Цим пристроєм керує домен\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nАдміністратор може відстежувати ваші дії в мережі, зокрема електронне листування, роботу в програмах і на захищених веб-сайтах.\n \nЩоб дізнатися більше, зверніться до свого адміністратора."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Третя сторона може відстежувати ваші\nдії в мережі, зокрема електронне листування, роботу в програмах і на захищених веб-сайтах.\n\nЦе робиться за допомогою довірених облікових даних, установлених на вашому пристрої."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Третя сторона може відстежувати ваші дії в мережі, зокрема електронне листування, роботу в програмах і на захищених веб-сайтах.\n\nЦе робиться за допомогою довірених облікових даних, установлених на вашому пристрої."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Перевірити довірені облікові дані"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Користувачі"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Користувачі та профілі"</string>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a1f7860..fd66c8b 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Trường cổng phải trống nếu trường máy chủ lưu trữ trống."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Cổng bạn đã nhập không hợp lệ."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP được sử dụng bởi trình duyệt nhưng có thể không được sử dụng bởi các ứng dụng khác."</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Vị trí:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID lân cận:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Làm loa ngoài"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Cho nhạc và phương tiện"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Nhớ cài đặt"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Hiển thị không dây"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Để xem thiết bị, bật hiển thị không dây."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Hiển thị không dây bị tắt do Wi-Fi bị tắt."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Tìm kiếm hiển thị"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Đang tìm kiếm..."</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Không tìm thấy hiển thị không dây lân cận nào."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Hiển thị thiết bị được ghép nối"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Thiết bị có sẵn"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Bật hiển thị không dây"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Không tìm thấy thiết bị lân cận nào."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Đang kết nối"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Đã kết nối"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Khả dụng"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Đang được sử dụng"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Không khả dụng"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Cài đặt hiển thị"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Ngắt kết nối?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Tác vụ này sẽ kết thúc kết nối của bạn với:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Tùy chọn hiển thị không dây"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Bỏ qua"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Xong"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Tên"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Bật"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Tắt"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Đã bị vô hiệu hóa"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Cho phép trao đổi dữ liệu khi máy tính bảng chạm vào thiết bị khác"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Cho phép trao đổi dữ liệu khi điện thoại chạm vào thiết bị khác"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"Xong"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Giám sát mạng"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Thiết bị này được quản lý bởi: \n <xliff:g id="MANAGING_DOMAIN">%s</xliff:g> \n \nQuản trị viên của bạn có thể giám sát hoạt động mạng của bạn, bao gồm email, ứng dụng và trang web an toàn. \n \nĐể biết thêm thông tin, hãy liên hệ với quản trị viên của bạn."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Bên thứ ba có thể giám sát hoạt động trên mạng\ncủa bạn, bao gồm email, ứng dụng và trang web bảo mật.\n\nMột bằng chứng xác thực tin cậy được cài đặt trên thiết bị của bạn có thể dẫn đến khả năng này."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Một bên thứ ba có thể đang theo dõi hoạt động mạng của bạn, bao gồm email, ứng dụng và các trang web bảo mật.\n\nĐiều này có thể xảy ra do một chứng chỉ xác thực đáng tin cậy được cài đặt trên thiết bị của bạn."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Kiểm tra bằng chứng xác thực tin cậy"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Người dùng"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Người dùng và tiểu sử"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 7104838..ca62a8a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -199,6 +199,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 代理，但其他应用可能不会使用。"</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">"相邻的 CID："</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"小区信息："</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"将基座用作免提电话"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"用于音乐和媒体"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"记住设置"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"无线显示"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"要查看设备，请打开无线显示功能。"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"由于 WLAN 已关闭，因此无线显示功能已停用。"</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"搜索显示设备"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"正在搜索…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"找不到附近有无线显示设备。"</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"已配对的显示设备"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"可用设备"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"启用无线显示功能"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"未在附近找到设备。"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"正在连接"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"已连接"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"可用"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"正在使用中"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"无法使用"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"显示设备设置"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"是否断开连接？"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"此操作将会断开您与以下设备的连接：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"无线显示选项"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"取消保存"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"完成"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"名称"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"开启"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"关闭"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"未启用"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"允许平板电脑在接触其他设备时交换数据"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"允许手机在接触其他设备时交换数据"</string>
@@ -1534,7 +1526,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"尝试连接另一蓝牙设备"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"应用所耗电量"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"停止或卸载应用"</string>
-    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"选择省电模式"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"选择“耗电量低”模式"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"该应用中可能提供了用于减少耗电量的设置"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"用户所耗电量"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"拔下电源后已过 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -1961,7 +1953,7 @@
     <string name="done_button" msgid="1991471253042622230">"完成"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"网络监控"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"此设备由以下企业域管理：\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\n您的管理员可以监控您的网络活动，包括收发电子邮件、使用应用和浏览安全网站。\n\n如要了解详情，请与您的管理员联系。"</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"第三方可以监控您的网络活动，包括\n收发电子邮件、使用应用和浏览安全网站。\n\n如果您在设备上安装受信任的凭据，就可能出现这种情况。"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"第三方可以监控您的网络活动，包括收发电子邮件、使用应用和浏览安全网站。\n\n如果您在设备上安装受信任的凭据，就可能出现这种情况。"</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"查看受信任的凭据"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"用户"</string>
     <string name="user_list_title" msgid="7937158411137563543">"用户和个人资料"</string>

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index dd28ce9..509e425 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml

@@ -199,6 +199,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" 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>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"作為手機揚聲器"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"用於音樂與媒體"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"記住設定"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"無線顯示"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"如要查看裝置，請開啟無線顯示功能。"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Wi-Fi 處於關閉狀態，因此已停用無線顯示功能。"</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"搜尋顯示裝置"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"正在搜尋…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"找不到附近的無線顯示裝置。"</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"已配對的顯示裝置"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"可用的裝置"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"啟用無線螢幕分享"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"找不到附近的裝置。"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"連線中"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"已連線"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"可用"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"使用中"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"無法使用"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"顯示設定"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"中斷連線？"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"這樣會結束您與下列裝置的連線：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"無線顯示選項"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"刪除"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"完成"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"名稱"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"開啟"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"關閉"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"已停用"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"允許平板電腦在與其他裝置接觸時交換資料"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"允許手機與其他裝置接觸時交換資料"</string>
@@ -1534,7 +1526,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"嘗試連接另一部藍牙裝置"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"應用程式耗電量"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"停止或解除安裝應用程式"</string>
-    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"選取省電模式"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"選取節約電池用量模式"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"應用程式可能有提供節省電力的設定"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"用戶用電量"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"拔除插頭後已耗電 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -1965,7 +1957,7 @@
     <string name="done_button" msgid="1991471253042622230">"完成"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"網絡監管"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"這部裝置由下列網域管理：\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\n您的管理員可以監控您的網絡活動，包括收發電郵、使用應用程式和瀏覽安全網站。\n\n如需詳細資料，請與您的管理員聯絡。"</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"第三方可以監察您的網絡活動，\n包括收發電郵、使用應用程式及瀏覽安全網站。\n\n當裝置安裝了信任的憑證，便可能會出現這種情況。"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"第三方可以監察您的網絡活動，包括收發電郵、使用應用程式及瀏覽安全網站。\n\n裝置安裝了信任的憑證後，便可能會出現這種情況。"</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"檢查信任的憑證"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"用戶"</string>
     <string name="user_list_title" msgid="7937158411137563543">"用戶和個人檔案"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 6234cb3..26f0b6b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -199,6 +199,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" 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>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"當成手機喇叭"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"使用於音樂與媒體"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"記住設定"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"無線螢幕分享"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"如要查看裝置，請開啟無線螢幕分享。"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"無線顯示裝置因 Wi-Fi 關閉而停用。"</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"搜尋顯示裝置"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"搜尋中…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"找不到附近的無線顯示裝置。"</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"已配對的顯示裝置"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"可用的裝置"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"啟用無線螢幕分享"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"找不到附近的裝置。"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"連線中"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"已連線"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"可以使用"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"正在使用中"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"不明"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"顯示裝置設定"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"中斷連線？"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"這個動作會結束您與下列裝置的連線：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"無線螢幕分享選項"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"刪除"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"完成"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"名稱"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"開啟"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"關閉"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"已停用"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"允許平板電腦在與其他裝置接觸時交換資料"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"允許手機與其他裝置接觸時交換資料"</string>
@@ -1965,7 +1957,7 @@
     <string name="done_button" msgid="1991471253042622230">"完成"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"網路監控"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"這個裝置由下列網域管理：\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\n您的管理員可以監控您的網路活動，包括收發電子郵件、使用應用程式和瀏覽安全網站。\n\n如需詳細資訊，請與您的管理員聯絡。"</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"第三方可以監控您的網路活動，\n包括收發電子郵件、使用應用程式及瀏覽安全網站。\n\n如果您在裝置上安裝信任的憑證，就會造成這種情況。"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"第三方可以監控您的網路活動，包括您使用電子郵件、應用程式和加密網站的情況。\n\n這是因為您的裝置上安裝了信任的憑證。"</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"檢查信任的憑證"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"使用者"</string>
     <string name="user_list_title" msgid="7937158411137563543">"使用者和個人資料"</string>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index cef5120..dd364bb 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -199,6 +199,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Inkundla yembobo kumelwe ingabi nalutho uma inkundla yesikhungo ingenalutho."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Imbobo oyithayiphile ayilungile."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Iphrokzi ye-HTTP isetshenziswa isiphequluli kodwa kungenzeka ingasetshenziswa ezinye izinhlelo zokusebenza"</string>
+    <string name="proxy_url" msgid="2523518669129974654">"I-PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Indawo:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"I-CID Yokwakhelana:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Ulwazi leseli:"</string>
@@ -512,28 +513,19 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Njenge sipikhafoni"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Komculo nemidiya"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Khumbula izilungiselelo"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Ukubonisa okungenazintambo"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Ukuze ubone amadivayisi, vula ukubonisa okungenazintambo."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Ukubonisa okungenazintambo kukhutshaziwe ngoba i-Wi-Fi ivaliwe."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Sesha ukubonisa"</string>
-    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Iyasesha…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Akukho ukubonisa okungenazintambo okuseduze okutholakele."</string>
-    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Ukubonisa okubhanqiwe"</string>
-    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Amadivayisi atholakalayo"</string>
+    <!-- no translation found for wifi_display_settings_title (4231553988812036681) -->
+    <skip />
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Nika amandla ukubukeka okungenantambo "</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Awekho amadivayisi aseduze atholakele."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Iyaxhuma"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Ixhunyiwe"</string>
-    <string name="wifi_display_status_available" msgid="1924167525172207067">"Kuyatholakala"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Kuyasebenza"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Ayitholakali"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Bonisa izilungiselelo"</string>
-    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Nqamula?"</string>
-    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Lokhu kuzophelisa uxhumano nge:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Izinketho zokubonisa ezingenazintambo"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Khohlwa"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Kwenziwe"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Igama"</string>
-    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Vuliwe"</string>
-    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Valiwe"</string>
-    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Kukhutshaziwe"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"i-NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Vumela ukushintshanisa kwedatha uma ithebhulethi ithinta enye idivayisi"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Vumela ukushintshanisa kwedatha uma ifoni ithinta enye idivayisi"</string>
@@ -1968,7 +1960,7 @@
     <string name="done_button" msgid="1991471253042622230">"Kwenziwe"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Ukuqashwa kwenethiwekhi"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Le divayisi iphathwa ngu-:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nUmlawuli wakho uyakwazi ukuqapha umsebenzi wenethiwekhi yakho, ofaka ama-imeyili, izinhlelo zokusebenza, namawebhusayithi aphephile.\n\nUkuze uthole olunye ulwazi, xhumana nomqondisi wakho."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Inkampani  yangaphandle ingakwazi ukuqapha umsebenzi wenethiwekhi yakho\n, okufaka phakathi ama-imeyili, izinhlelo zokusebenza namawebhusayithi aphephile.\n\nIsiqinisekiso esethenjwayo kudivayisi yakho senza lokhu kwenzeke."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Inkampani yangaphandle iyakwazi ukugada umsebenzi wakho wenethiwekhi, ofaka ama-imeyili, izinhlelo zokusebenza, namawebhusayithi aphephile.\n\nUkuqinisekisa okuthenjiwe okufakwe kudivayisi yakho kwenza lokhu kukhoneke."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Hlola ukuqinisekisa okwethenjwayo"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Abasebenzisi"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Abasebenzisi namaphrofayela"</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index bb537bf..78ac108 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml

@@ -1226,37 +1226,22 @@
     <string name="bluetooth_dock_settings_remember">Remember settings</string>
 
     <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
-    <string name="wifi_display_settings_title">Wireless display</string>
-    <!-- Wifi Display settings. Text displayed when Wifi display is off and device list is empty [CHAR LIMIT=80]-->
-    <string name="wifi_display_settings_empty_list_wifi_display_off">To see devices, turn wireless display on.</string>
-    <!-- Wifi Display settings. Text displayed when Wifi Display is off and device list is empty [CHAR LIMIT=80]-->
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled">Wireless display is disabled because Wi\u2011Fi is off.</string>
-    <!-- Wifi Display settings. The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
-    <string name="wifi_display_search_for_devices">Search for displays</string>
-    <!-- Wifi Display settings. The title of the action button while a search for nearby devices is in progress [CHAR LIMIT=20] -->
-    <string name="wifi_display_searching_for_devices">Searching\u2026</string>
+    <string name="wifi_display_settings_title">Screen cast</string>
+    <!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->
+    <string name="wifi_display_enable_menu_item">Enable wireless display</string>
     <!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
-    <string name="wifi_display_no_devices_found">No nearby wireless displays were found.</string>
-    <!-- Wifi Display settings. The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
-    <string name="wifi_display_paired_devices">Paired displays</string>
-    <!-- Wifi Display settings. The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
-    <string name="wifi_display_available_devices">Available devices</string>
+    <string name="wifi_display_no_devices_found">No nearby devices were found.</string>
     <!-- Wifi Display settings. The status summary for connecting devices. [CHAR LIMIT=40] -->
     <string name="wifi_display_status_connecting">Connecting</string>
     <!-- Wifi Display settings. The status summary for connected devices. [CHAR LIMIT=40] -->
     <string name="wifi_display_status_connected">Connected</string>
-    <!-- Wifi Display settings. The status summary for available devices. [CHAR LIMIT=40] -->
-    <string name="wifi_display_status_available">Available</string>
     <!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->
     <string name="wifi_display_status_in_use">In use</string>
+    <!-- Wifi Display settings. The status summary for devices that's not available. [CHAR LIMIT=40] -->
+    <string name="wifi_display_status_not_available">Unavailable</string>
     <!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
     <string name="wifi_display_details">Display settings</string>
 
-    <!-- Wifi Display settings. Disconnect dialog.  The title of the dialog. [CHAR LIMIT=40] -->
-    <string name="wifi_display_disconnect_title">Disconnect?</string>
-    <!-- Wifi Display settings. Disconnect dialog.  Message for disconnecting from the display. [CHAR LIMIT=NONE] -->
-    <string name="wifi_display_disconnect_text">This will end your connection with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b></string>
-
     <!-- Wifi Display settings. Options dialog.  The title of the dialog. [CHAR LIMIT=40] -->
     <string name="wifi_display_options_title">Wireless display options</string>
     <!-- Wifi Display settings. Options dialog.  The forget button text. [CHAR LIMIT=20] -->
@@ -1266,13 +1251,6 @@
     <!-- Wifi Display settings. Options dialog.  The name label used when prompting the user to rename the display. [CHAR LIMIT=20] -->
     <string name="wifi_display_options_name">Name</string>
 
-    <!-- Wifi Display settings. Summary shown in Display settings. Text used for 'On' state. [CHAR LIMIT=40] -->
-    <string name="wifi_display_summary_on">On</string>
-    <!-- Wifi Display settings. Summary shown in Display settings. Text used for 'Off' state. [CHAR LIMIT=40] -->
-    <string name="wifi_display_summary_off">Off</string>
-    <!-- Wifi Display settings. Summary shown in Display settings. Text used for 'Disabled' state. [CHAR LIMIT=40] -->
-    <string name="wifi_display_summary_disabled">Disabled</string>
-
     <!-- Wifi Display settings. The sub heading for wireless display certification options. [CHAR LIMIT=40] -->
     <string name="wifi_display_certification_heading" translatable="false">Certification</string>
     <!-- Wifi Display settings. The section title for wireless display session info. [CHAR LIMIT=40] -->

diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index c379ec3..7772b7c 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java

@@ -21,16 +21,10 @@
 import android.app.ActivityManagerNative;
 import android.app.Dialog;
 import android.app.admin.DevicePolicyManager;
-import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.hardware.display.DisplayManager;
-import android.hardware.display.WifiDisplay;
-import android.hardware.display.WifiDisplayStatus;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.preference.CheckBoxPreference;
@@ -40,7 +34,6 @@
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
-import android.util.AttributeSet;
 import android.util.Log;
 
 import com.android.internal.view.RotationPolicy;
@@ -60,12 +53,9 @@
     private static final String KEY_FONT_SIZE = "font_size";
     private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
     private static final String KEY_SCREEN_SAVER = "screensaver";
-    private static final String KEY_WIFI_DISPLAY = "wifi_display";
 
     private static final int DLG_GLOBAL_CHANGE_WARNING = 1;
 
-    private DisplayManager mDisplayManager;
-
     private CheckBoxPreference mAccelerometer;
     private WarnedListPreference mFontSizePref;
     private CheckBoxPreference mNotificationPulse;
@@ -75,9 +65,6 @@
     private ListPreference mScreenTimeoutPreference;
     private Preference mScreenSaverPreference;
 
-    private WifiDisplayStatus mWifiDisplayStatus;
-    private Preference mWifiDisplayPreference;
-
     private final RotationPolicy.RotationPolicyListener mRotationPolicyListener =
             new RotationPolicy.RotationPolicyListener() {
         @Override
@@ -135,16 +122,6 @@
                 Log.e(TAG, Settings.System.NOTIFICATION_LIGHT_PULSE + " not found");
             }
         }
-
-        mDisplayManager = (DisplayManager)getActivity().getSystemService(
-                Context.DISPLAY_SERVICE);
-        mWifiDisplayStatus = mDisplayManager.getWifiDisplayStatus();
-        mWifiDisplayPreference = (Preference)findPreference(KEY_WIFI_DISPLAY);
-        if (mWifiDisplayStatus.getFeatureState()
-                == WifiDisplayStatus.FEATURE_STATE_UNAVAILABLE) {
-            getPreferenceScreen().removePreference(mWifiDisplayPreference);
-            mWifiDisplayPreference = null;
-        }
     }
 
     private void updateTimeoutPreferenceDescription(long currentTimeout) {
@@ -252,12 +229,6 @@
         RotationPolicy.registerRotationPolicyListener(getActivity(),
                 mRotationPolicyListener);
 
-        if (mWifiDisplayPreference != null) {
-            getActivity().registerReceiver(mReceiver, new IntentFilter(
-                    DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED));
-            mWifiDisplayStatus = mDisplayManager.getWifiDisplayStatus();
-        }
-
         updateState();
     }
 
@@ -267,10 +238,6 @@
 
         RotationPolicy.unregisterRotationPolicyListener(getActivity(),
                 mRotationPolicyListener);
-
-        if (mWifiDisplayPreference != null) {
-            getActivity().unregisterReceiver(mReceiver);
-        }
     }
 
     @Override
@@ -291,7 +258,6 @@
         updateAccelerometerRotationCheckbox();
         readFontSizePreference(mFontSizePref);
         updateScreenSaverSummary();
-        updateWifiDisplaySummary();
     }
 
     private void updateScreenSaverSummary() {
@@ -301,23 +267,6 @@
         }
     }
 
-    private void updateWifiDisplaySummary() {
-        if (mWifiDisplayPreference != null) {
-            switch (mWifiDisplayStatus.getFeatureState()) {
-                case WifiDisplayStatus.FEATURE_STATE_OFF:
-                    mWifiDisplayPreference.setSummary(R.string.wifi_display_summary_off);
-                    break;
-                case WifiDisplayStatus.FEATURE_STATE_ON:
-                    mWifiDisplayPreference.setSummary(R.string.wifi_display_summary_on);
-                    break;
-                case WifiDisplayStatus.FEATURE_STATE_DISABLED:
-                default:
-                    mWifiDisplayPreference.setSummary(R.string.wifi_display_summary_disabled);
-                    break;
-            }
-        }
-    }
-
     private void updateAccelerometerRotationCheckbox() {
         if (getActivity() == null) return;
 
@@ -347,6 +296,7 @@
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
+    @Override
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         final String key = preference.getKey();
         if (KEY_SCREEN_TIMEOUT.equals(key)) {
@@ -365,17 +315,6 @@
         return true;
     }
 
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent.getAction().equals(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED)) {
-                mWifiDisplayStatus = (WifiDisplayStatus)intent.getParcelableExtra(
-                        DisplayManager.EXTRA_WIFI_DISPLAY_STATUS);
-                updateWifiDisplaySummary();
-            }
-        }
-    };
-
     @Override
     public boolean onPreferenceClick(Preference preference) {
         if (preference == mFontSizePref) {

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index e93fa18..db7eb2b 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java

@@ -506,7 +506,6 @@
         // uiOptions for fragments also defined as activities in manifest.
         if (WifiSettings.class.getName().equals(fragmentName) ||
                 WifiP2pSettings.class.getName().equals(fragmentName) ||
-                WifiDisplaySettings.class.getName().equals(fragmentName) ||
                 BluetoothSettings.class.getName().equals(fragmentName) ||
                 DreamSettings.class.getName().equals(fragmentName) ||
                 LocationSettings.class.getName().equals(fragmentName) ||

diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index f097fd6..0c568f0 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java

@@ -154,44 +154,41 @@
     public Dialog onCreateDialog(int dialogId) {
         switch (dialogId) {
             case DIALOG_ID_ENABLE_WARNING: {
-                mShownDialogId = DIALOG_ID_ENABLE_WARNING;
-                AccessibilityServiceInfo info = getAccessibilityServiceInfo();
-                if (info == null) {
-                    return null;
-                }
-                AlertDialog ad = new AlertDialog.Builder(getActivity())
-                        .setTitle(getString(R.string.enable_service_title,
-                                info.getResolveInfo().loadLabel(getPackageManager())))
-                        .setIconAttribute(android.R.attr.alertDialogIcon)
-                        .setView(createEnableDialogContentView(info))
-                        .setCancelable(true)
-                        .setPositiveButton(android.R.string.ok, this)
-                        .setNegativeButton(android.R.string.cancel, this)
-                        .create();
-                ad.getButton(AlertDialog.BUTTON_POSITIVE)
-                        .setFilterTouchesWhenObscured(true);
-                return ad;
+            mShownDialogId = DIALOG_ID_ENABLE_WARNING;
+            AccessibilityServiceInfo info = getAccessibilityServiceInfo();
+            if (info == null) {
+                return null;
             }
+            return new AlertDialog.Builder(getActivity())
+            .setTitle(getString(R.string.enable_service_title,
+                    info.getResolveInfo().loadLabel(getPackageManager())))
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
+                    .setView(createEnableDialogContentView(info))
+                    .setCancelable(true)
+                    .setPositiveButton(android.R.string.ok, this)
+                    .setNegativeButton(android.R.string.cancel, this)
+                    .create();
+        }
             case DIALOG_ID_DISABLE_WARNING: {
-                mShownDialogId = DIALOG_ID_DISABLE_WARNING;
-                AccessibilityServiceInfo info = getAccessibilityServiceInfo();
-                if (info == null) {
-                    return null;
-                }
-                return new AlertDialog.Builder(getActivity())
-                        .setTitle(getString(R.string.disable_service_title,
-                                info.getResolveInfo().loadLabel(getPackageManager())))
-                        .setIconAttribute(android.R.attr.alertDialogIcon)
-                        .setMessage(getString(R.string.disable_service_message,
-                                info.getResolveInfo().loadLabel(getPackageManager())))
-                        .setCancelable(true)
-                        .setPositiveButton(android.R.string.ok, this)
-                        .setNegativeButton(android.R.string.cancel, this)
-                        .create();
+            mShownDialogId = DIALOG_ID_DISABLE_WARNING;
+            AccessibilityServiceInfo info = getAccessibilityServiceInfo();
+            if (info == null) {
+                return null;
             }
+            return new AlertDialog.Builder(getActivity())
+            .setTitle(getString(R.string.disable_service_title,
+                    info.getResolveInfo().loadLabel(getPackageManager())))
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
+                    .setMessage(getString(R.string.disable_service_message,
+                            info.getResolveInfo().loadLabel(getPackageManager())))
+                    .setCancelable(true)
+                    .setPositiveButton(android.R.string.ok, this)
+                    .setNegativeButton(android.R.string.cancel, this)
+                    .create();
+        }
             default: {
-                throw new IllegalArgumentException();
-            }
+            throw new IllegalArgumentException();
+        }
         }
     }
 

diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelper.java b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java
index 71c69a3..0191692 100644
--- a/src/com/android/settings/fuelgauge/BatteryStatsHelper.java
+++ b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java

@@ -490,6 +490,15 @@
                     * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_SCAN)) / 1000;
             power += p;
             if (DEBUG && p != 0) Log.i(TAG, String.format("wifi scanning power=%.2f", p));
+            for (int bin = 0; bin < BatteryStats.Uid.NUM_WIFI_BATCHED_SCAN_BINS; bin++) {
+                long batchScanTimeMs = u.getWifiBatchedScanTime(bin, uSecTime, which) / 1000;
+                p = (batchScanTimeMs
+                        * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_BATCHED_SCAN, bin));
+                power += p;
+                if (DEBUG && p != 0) {
+                    Log.i(TAG, String.format("wifi batched scanning lvl %d = %.2f", bin, p));
+                }
+            }
 
             // Process Sensor usage
             Map<Integer, ? extends BatteryStats.Uid.Sensor> sensorStats = u.getSensorStats();

diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index 6ec79f3..d04f6f2 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java

@@ -29,6 +29,8 @@
 import android.hardware.display.DisplayManager;
 import android.hardware.display.WifiDisplay;
 import android.hardware.display.WifiDisplayStatus;
+import android.media.MediaRouter;
+import android.media.MediaRouter.RouteInfo;
 import android.net.Uri;
 import android.net.wifi.p2p.WifiP2pManager;
 import android.net.wifi.p2p.WifiP2pManager.ActionListener;
@@ -63,31 +65,48 @@
 import android.widget.Switch;
 import android.widget.TextView;
 
+import com.android.internal.app.MediaRouteDialogPresenter;
 import com.android.settings.ProgressCategory;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
 /**
  * The Settings screen for WifiDisplay configuration and connection management.
+ *
+ * The wifi display routes are integrated together with other remote display routes
+ * from the media router.  It may happen that wifi display isn't actually available
+ * on the system.  In that case, the enable option will not be shown but other
+ * remote display routes will continue to be made available.
  */
 public final class WifiDisplaySettings extends SettingsPreferenceFragment {
     private static final String TAG = "WifiDisplaySettings";
     private static final boolean DEBUG = false;
 
-    private static final int MENU_ID_SCAN = Menu.FIRST;
+    private static final int MENU_ID_ENABLE_WIFI_DISPLAY = Menu.FIRST;
 
+    private static final int CHANGE_SETTINGS = 1 << 0;
+    private static final int CHANGE_ROUTES = 1 << 1;
+    private static final int CHANGE_WIFI_DISPLAY_STATUS = 1 << 2;
+    private static final int CHANGE_ALL = -1;
+
+    private static final int ORDER_CERTIFICATION = 1;
+    private static final int ORDER_CONNECTED = 2;
+    private static final int ORDER_AVAILABLE = 3;
+    private static final int ORDER_UNAVAILABLE = 4;
+
+    private final Handler mHandler;
+
+    private MediaRouter mRouter;
     private DisplayManager mDisplayManager;
 
+    private boolean mStarted;
+    private int mPendingChanges;
+
     private boolean mWifiDisplayOnSetting;
     private WifiDisplayStatus mWifiDisplayStatus;
 
-    private PreferenceGroup mPairedDevicesCategory;
-    private ProgressCategory mAvailableDevicesCategory;
-
     private TextView mEmptyView;
 
-    private Switch mActionBarSwitch;
-
     /* certification */
     private boolean mWifiDisplayCertificationOn;
     private WifiP2pManager mWifiP2pManager;
@@ -100,15 +119,18 @@
     private int mOperatingChannel;
 
     public WifiDisplaySettings() {
+        mHandler = new Handler();
     }
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        mDisplayManager = (DisplayManager)getActivity().getSystemService(Context.DISPLAY_SERVICE);
-        mWifiP2pManager = (WifiP2pManager)getActivity().getSystemService(Context.WIFI_P2P_SERVICE);
-        mWifiP2pChannel = mWifiP2pManager.initialize(getActivity(), Looper.getMainLooper(), null);
+        final Context context = getActivity();
+        mRouter = (MediaRouter)context.getSystemService(Context.MEDIA_ROUTER_SERVICE);
+        mDisplayManager = (DisplayManager)context.getSystemService(Context.DISPLAY_SERVICE);
+        mWifiP2pManager = (WifiP2pManager)context.getSystemService(Context.WIFI_P2P_SERVICE);
+        mWifiP2pChannel = mWifiP2pManager.initialize(context, Looper.getMainLooper(), null);
 
         addPreferencesFromResource(R.xml.wifi_display_settings);
         setHasOptionsMenu(true);
@@ -118,42 +140,17 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        Activity activity = getActivity();
-        mActionBarSwitch = new Switch(activity);
-        mActionBarSwitch.setOnCheckedChangeListener(mSwitchOnCheckedChangedListener);
-
-        final int padding = activity.getResources().getDimensionPixelSize(
-                R.dimen.action_bar_switch_padding);
-        mActionBarSwitch.setPaddingRelative(0, 0, padding, 0);
-        activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
-                ActionBar.DISPLAY_SHOW_CUSTOM);
-        activity.getActionBar().setCustomView(mActionBarSwitch,
-                new ActionBar.LayoutParams(
-                        ActionBar.LayoutParams.WRAP_CONTENT,
-                        ActionBar.LayoutParams.WRAP_CONTENT,
-                        Gravity.CENTER_VERTICAL | Gravity.END));
-
         mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
+        mEmptyView.setText(R.string.wifi_display_no_devices_found);
         getListView().setEmptyView(mEmptyView);
-
-        update();
-
-        if (mWifiDisplayStatus.getFeatureState() == WifiDisplayStatus.FEATURE_STATE_UNAVAILABLE) {
-            activity.finish();
-        }
     }
 
     @Override
-    public void onDestroyView() {
-        getActivity().getActionBar().setCustomView(null);
-        super.onDestroyView();
-    }
+    public void onStart() {
+        super.onStart();
+        mStarted = true;
 
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        Context context = getActivity();
+        final Context context = getActivity();
         IntentFilter filter = new IntentFilter();
         filter.addAction(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED);
         context.registerReceiver(mReceiver, filter);
@@ -163,136 +160,156 @@
         getContentResolver().registerContentObserver(Settings.Global.getUriFor(
                 Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON), false, mSettingsObserver);
         getContentResolver().registerContentObserver(Settings.Global.getUriFor(
-            Settings.Global.WIFI_DISPLAY_WPS_CONFIG), false, mSettingsObserver);
+                Settings.Global.WIFI_DISPLAY_WPS_CONFIG), false, mSettingsObserver);
 
-        mDisplayManager.scanWifiDisplays();
+        mRouter.addCallback(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY, mRouterCallback,
+                MediaRouter.CALLBACK_FLAG_PERFORM_ACTIVE_SCAN);
 
-        update();
+        update(CHANGE_ALL);
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
+    public void onStop() {
+        super.onStop();
+        mStarted = false;
 
-        Context context = getActivity();
+        final Context context = getActivity();
         context.unregisterReceiver(mReceiver);
 
         getContentResolver().unregisterContentObserver(mSettingsObserver);
+
+        mRouter.removeCallback(mRouterCallback);
+
+        unscheduleUpdate();
     }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        MenuItem item = menu.add(Menu.NONE, MENU_ID_SCAN, 0,
-                mWifiDisplayStatus.getScanState() == WifiDisplayStatus.SCAN_STATE_SCANNING ?
-                        R.string.wifi_display_searching_for_devices :
-                                R.string.wifi_display_search_for_devices);
-        item.setEnabled(mWifiDisplayStatus.getFeatureState() == WifiDisplayStatus.FEATURE_STATE_ON
-                && mWifiDisplayStatus.getScanState() == WifiDisplayStatus.SCAN_STATE_NOT_SCANNING);
-        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        if (mWifiDisplayStatus != null && mWifiDisplayStatus.getFeatureState()
+                != WifiDisplayStatus.FEATURE_STATE_UNAVAILABLE) {
+            MenuItem item = menu.add(Menu.NONE, MENU_ID_ENABLE_WIFI_DISPLAY, 0,
+                    R.string.wifi_display_enable_menu_item);
+            item.setCheckable(true);
+            item.setChecked(mWifiDisplayOnSetting);
+        }
         super.onCreateOptionsMenu(menu, inflater);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case MENU_ID_SCAN:
-                if (mWifiDisplayStatus.getFeatureState() == WifiDisplayStatus.FEATURE_STATE_ON) {
-                    mDisplayManager.scanWifiDisplays();
-                }
+            case MENU_ID_ENABLE_WIFI_DISPLAY:
+                mWifiDisplayOnSetting = !item.isChecked();
+                item.setChecked(mWifiDisplayOnSetting);
+                Settings.Global.putInt(getContentResolver(),
+                        Settings.Global.WIFI_DISPLAY_ON, mWifiDisplayOnSetting ? 1 : 0);
                 return true;
         }
         return super.onOptionsItemSelected(item);
     }
 
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
-            Preference preference) {
-        if (preference instanceof WifiDisplayPreference) {
-            WifiDisplayPreference p = (WifiDisplayPreference)preference;
-            WifiDisplay display = p.getDisplay();
-
-            if (display.equals(mWifiDisplayStatus.getActiveDisplay())) {
-                showDisconnectDialog(display);
-            } else if (display.canConnect()){
-                mDisplayManager.connectWifiDisplay(display.getDeviceAddress());
+    private void scheduleUpdate(int changes) {
+        if (mStarted) {
+            if (mPendingChanges == 0) {
+                mHandler.post(mUpdateRunnable);
             }
+            mPendingChanges |= changes;
+        }
+    }
+
+    private void unscheduleUpdate() {
+        if (mPendingChanges != 0) {
+            mPendingChanges = 0;
+            mHandler.removeCallbacks(mUpdateRunnable);
+        }
+    }
+
+    private void update(int changes) {
+        boolean invalidateOptions = false;
+
+        // Update settings.
+        if ((changes & CHANGE_SETTINGS) != 0) {
+            mWifiDisplayOnSetting = Settings.Global.getInt(getContentResolver(),
+                    Settings.Global.WIFI_DISPLAY_ON, 0) != 0;
+            mWifiDisplayCertificationOn = Settings.Global.getInt(getContentResolver(),
+                    Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, 0) != 0;
+            mWpsConfig = Settings.Global.getInt(getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_WPS_CONFIG, WpsInfo.INVALID);
+
+            // The wifi display enabled setting may have changed.
+            invalidateOptions = true;
         }
 
-        return super.onPreferenceTreeClick(preferenceScreen, preference);
-    }
+        // Update wifi display state.
+        if ((changes & CHANGE_WIFI_DISPLAY_STATUS) != 0) {
+            mWifiDisplayStatus = mDisplayManager.getWifiDisplayStatus();
 
-    private void update() {
-        mWifiDisplayOnSetting = Settings.Global.getInt(getContentResolver(),
-                Settings.Global.WIFI_DISPLAY_ON, 0) != 0;
-        mWifiDisplayCertificationOn = Settings.Global.getInt(getContentResolver(),
-                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, 0) != 0;
-        mWpsConfig = Settings.Global.getInt(getContentResolver(),
-            Settings.Global.WIFI_DISPLAY_WPS_CONFIG, WpsInfo.INVALID);
-        mWifiDisplayStatus = mDisplayManager.getWifiDisplayStatus();
+            // The wifi display feature state may have changed.
+            invalidateOptions = true;
+        }
 
-        applyState();
-    }
-
-    private void applyState() {
-        final int featureState = mWifiDisplayStatus.getFeatureState();
-        mActionBarSwitch.setEnabled(featureState != WifiDisplayStatus.FEATURE_STATE_DISABLED);
-        mActionBarSwitch.setChecked(mWifiDisplayOnSetting);
-
+        // Rebuild the routes.
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
         preferenceScreen.removeAll();
 
-        if (featureState == WifiDisplayStatus.FEATURE_STATE_ON) {
-            final WifiDisplay[] displays = mWifiDisplayStatus.getDisplays();
+        // Add all known remote display routes.
+        final int routeCount = mRouter.getRouteCount();
+        for (int i = 0; i < routeCount; i++) {
+            MediaRouter.RouteInfo route = mRouter.getRouteAt(i);
+            if (route.matchesTypes(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY)) {
+                preferenceScreen.addPreference(createRoutePreference(route));
+            }
+        }
 
+        // Additional features for wifi display routes.
+        if (mWifiDisplayStatus != null
+                && mWifiDisplayStatus.getFeatureState() == WifiDisplayStatus.FEATURE_STATE_ON) {
+            // Add all unpaired wifi displays.
+            for (WifiDisplay display : mWifiDisplayStatus.getDisplays()) {
+                if (!display.isRemembered() && display.isAvailable()
+                        && !display.equals(mWifiDisplayStatus.getActiveDisplay())) {
+                    preferenceScreen.addPreference(new UnpairedWifiDisplayPreference(
+                            getActivity(), display));
+                }
+            }
+
+            // Add the certification menu if enabled in developer options.
             if (mWifiDisplayCertificationOn) {
                 buildCertificationMenu(preferenceScreen);
             }
-
-            if (mPairedDevicesCategory == null) {
-                mPairedDevicesCategory = new PreferenceCategory(getActivity());
-                mPairedDevicesCategory.setTitle(R.string.wifi_display_paired_devices);
-            } else {
-                mPairedDevicesCategory.removeAll();
-            }
-            preferenceScreen.addPreference(mPairedDevicesCategory);
-
-            if (mAvailableDevicesCategory == null) {
-                mAvailableDevicesCategory = new ProgressCategory(getActivity(), null,
-                        R.string.wifi_display_no_devices_found);
-                mAvailableDevicesCategory.setTitle(R.string.wifi_display_available_devices);
-            } else {
-                mAvailableDevicesCategory.removeAll();
-            }
-            preferenceScreen.addPreference(mAvailableDevicesCategory);
-
-            for (WifiDisplay d : displays) {
-                if (d.isRemembered()) {
-                    mPairedDevicesCategory.addPreference(createWifiDisplayPreference(d));
-                } else if (d.isAvailable()){
-                    mAvailableDevicesCategory.addPreference(createWifiDisplayPreference(d));
-                }
-            }
-            if (mPairedDevicesCategory.getPreferenceCount() == 0) {
-                preferenceScreen.removePreference(mPairedDevicesCategory);
-            }
-            if (mWifiDisplayStatus.getScanState() == WifiDisplayStatus.SCAN_STATE_SCANNING) {
-                mAvailableDevicesCategory.setProgress(true);
-            } else {
-                mAvailableDevicesCategory.setProgress(false);
-            }
-        } else {
-            mEmptyView.setText(featureState == WifiDisplayStatus.FEATURE_STATE_OFF ?
-                    R.string.wifi_display_settings_empty_list_wifi_display_off :
-                            R.string.wifi_display_settings_empty_list_wifi_display_disabled);
         }
 
-        getActivity().invalidateOptionsMenu();
+        // Invalidate menu options if needed.
+        if (invalidateOptions) {
+            getActivity().invalidateOptionsMenu();
+        }
+    }
+
+    private RoutePreference createRoutePreference(MediaRouter.RouteInfo route) {
+        WifiDisplay display = findWifiDisplay(route.getDeviceAddress());
+        if (display != null) {
+            return new WifiDisplayRoutePreference(getActivity(), route, display);
+        } else {
+            return new RoutePreference(getActivity(), route);
+        }
+    }
+
+    private WifiDisplay findWifiDisplay(String deviceAddress) {
+        if (mWifiDisplayStatus != null && deviceAddress != null) {
+            for (WifiDisplay display : mWifiDisplayStatus.getDisplays()) {
+                if (display.getDeviceAddress().equals(deviceAddress)) {
+                    return display;
+                }
+            }
+        }
+        return null;
     }
 
     private void buildCertificationMenu(final PreferenceScreen preferenceScreen) {
         if (mCertCategory == null) {
             mCertCategory = new PreferenceCategory(getActivity());
             mCertCategory.setTitle(R.string.wifi_display_certification_heading);
+            mCertCategory.setOrder(ORDER_CERTIFICATION);
         } else {
             mCertCategory.removeAll();
         }
@@ -526,53 +543,22 @@
         });
     }
 
-    private Preference createWifiDisplayPreference(final WifiDisplay d) {
-        WifiDisplayPreference p = new WifiDisplayPreference(getActivity(), d);
-        if (d.equals(mWifiDisplayStatus.getActiveDisplay())) {
-            switch (mWifiDisplayStatus.getActiveDisplayState()) {
-                case WifiDisplayStatus.DISPLAY_STATE_CONNECTED:
-                    p.setSummary(R.string.wifi_display_status_connected);
-                    break;
-                case WifiDisplayStatus.DISPLAY_STATE_CONNECTING:
-                    p.setSummary(R.string.wifi_display_status_connecting);
-                    break;
-            }
-        } else if (d.isAvailable()) {
-            if (!d.canConnect()) {
-                p.setSummary(R.string.wifi_display_status_in_use);
-                p.setEnabled(false);
-            } else if (d.isRemembered()) {
-                p.setSummary(R.string.wifi_display_status_available);
-            }
+    private void toggleRoute(MediaRouter.RouteInfo route) {
+        if (route.isSelected()) {
+            MediaRouteDialogPresenter.showDialogFragment(getActivity(),
+                    MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY, null);
+        } else {
+            route.select();
         }
-        if (d.isRemembered()) {
-            p.setWidgetLayoutResource(R.layout.wifi_display_preference);
-        }
-        return p;
     }
 
-    private void showDisconnectDialog(final WifiDisplay display) {
-        DialogInterface.OnClickListener ok = new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                if (display.equals(mWifiDisplayStatus.getActiveDisplay())) {
-                    mDisplayManager.disconnectWifiDisplay();
-                }
-            }
-        };
-
-        AlertDialog dialog = new AlertDialog.Builder(getActivity())
-                .setCancelable(true)
-                .setTitle(R.string.wifi_display_disconnect_title)
-                .setMessage(Html.fromHtml(getResources().getString(
-                        R.string.wifi_display_disconnect_text, display.getFriendlyDisplayName())))
-                .setPositiveButton(android.R.string.ok, ok)
-                .setNegativeButton(android.R.string.cancel, null)
-                .create();
-        dialog.show();
+    private void pairWifiDisplay(WifiDisplay display) {
+        if (display.canConnect()) {
+            mDisplayManager.connectWifiDisplay(display.getDeviceAddress());
+        }
     }
 
-    private void showOptionsDialog(final WifiDisplay display) {
+    private void showWifiDisplayOptionsDialog(final WifiDisplay display) {
         View view = getActivity().getLayoutInflater().inflate(R.layout.wifi_display_options, null);
         final EditText nameEditText = (EditText)view.findViewById(R.id.name);
         nameEditText.setText(display.getFriendlyDisplayName());
@@ -604,22 +590,12 @@
         dialog.show();
     }
 
-    private static boolean contains(WifiDisplay[] displays, String address) {
-        for (WifiDisplay d : displays) {
-            if (d.getDeviceAddress().equals(address)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private final CompoundButton.OnCheckedChangeListener mSwitchOnCheckedChangedListener =
-            new CompoundButton.OnCheckedChangeListener() {
+    private final Runnable mUpdateRunnable = new Runnable() {
         @Override
-        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-            mWifiDisplayOnSetting = isChecked;
-            Settings.Global.putInt(getContentResolver(),
-                    Settings.Global.WIFI_DISPLAY_ON, isChecked ? 1 : 0);
+        public void run() {
+            final int changes = mPendingChanges;
+            mPendingChanges = 0;
+            update(changes);
         }
     };
 
@@ -628,10 +604,7 @@
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             if (action.equals(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED)) {
-                WifiDisplayStatus status = (WifiDisplayStatus)intent.getParcelableExtra(
-                        DisplayManager.EXTRA_WIFI_DISPLAY_STATUS);
-                mWifiDisplayStatus = status;
-                applyState();
+                scheduleUpdate(CHANGE_WIFI_DISPLAY_STATUS);
             }
         }
     };
@@ -639,23 +612,87 @@
     private final ContentObserver mSettingsObserver = new ContentObserver(new Handler()) {
         @Override
         public void onChange(boolean selfChange, Uri uri) {
-            update();
+            scheduleUpdate(CHANGE_SETTINGS);
         }
     };
 
-    private final class WifiDisplayPreference extends Preference
+    private final MediaRouter.Callback mRouterCallback = new MediaRouter.SimpleCallback() {
+        @Override
+        public void onRouteAdded(MediaRouter router, RouteInfo info) {
+            scheduleUpdate(CHANGE_ROUTES);
+        }
+
+        @Override
+        public void onRouteChanged(MediaRouter router, RouteInfo info) {
+            scheduleUpdate(CHANGE_ROUTES);
+        }
+
+        @Override
+        public void onRouteRemoved(MediaRouter router, RouteInfo info) {
+            scheduleUpdate(CHANGE_ROUTES);
+        }
+
+        @Override
+        public void onRouteSelected(MediaRouter router, int type, RouteInfo info) {
+            scheduleUpdate(CHANGE_ROUTES);
+        }
+
+        @Override
+        public void onRouteUnselected(MediaRouter router, int type, RouteInfo info) {
+            scheduleUpdate(CHANGE_ROUTES);
+        }
+    };
+
+    private class RoutePreference extends Preference
+            implements Preference.OnPreferenceClickListener {
+        private final MediaRouter.RouteInfo mRoute;
+
+        public RoutePreference(Context context, MediaRouter.RouteInfo route) {
+            super(context);
+
+            mRoute = route;
+            setTitle(route.getName());
+            setSummary(route.getDescription());
+            setEnabled(route.isEnabled());
+            if (route.isSelected()) {
+                setOrder(ORDER_CONNECTED);
+                if (route.isConnecting()) {
+                    setSummary(R.string.wifi_display_status_connecting);
+                } else {
+                    setSummary(R.string.wifi_display_status_connected);
+                }
+            } else {
+                if (isEnabled()) {
+                    setOrder(ORDER_AVAILABLE);
+                } else {
+                    setOrder(ORDER_UNAVAILABLE);
+                    if (route.getStatusCode() == MediaRouter.RouteInfo.STATUS_IN_USE) {
+                        setSummary(R.string.wifi_display_status_in_use);
+                    } else {
+                        setSummary(R.string.wifi_display_status_not_available);
+                    }
+                }
+            }
+            setOnPreferenceClickListener(this);
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            toggleRoute(mRoute);
+            return true;
+        }
+    }
+
+    private class WifiDisplayRoutePreference extends RoutePreference
             implements View.OnClickListener {
         private final WifiDisplay mDisplay;
 
-        public WifiDisplayPreference(Context context, WifiDisplay display) {
-            super(context);
+        public WifiDisplayRoutePreference(Context context, MediaRouter.RouteInfo route,
+                WifiDisplay display) {
+            super(context, route);
 
             mDisplay = display;
-            setTitle(display.getFriendlyDisplayName());
-        }
-
-        public WifiDisplay getDisplay() {
-            return mDisplay;
+            setWidgetLayoutResource(R.layout.wifi_display_preference);
         }
 
         @Override
@@ -665,19 +702,46 @@
             ImageView deviceDetails = (ImageView) view.findViewById(R.id.deviceDetails);
             if (deviceDetails != null) {
                 deviceDetails.setOnClickListener(this);
-
                 if (!isEnabled()) {
                     TypedValue value = new TypedValue();
                     getContext().getTheme().resolveAttribute(android.R.attr.disabledAlpha,
                             value, true);
                     deviceDetails.setImageAlpha((int)(value.getFloat() * 255));
+                    deviceDetails.setEnabled(true); // always allow button to be pressed
                 }
             }
         }
 
         @Override
         public void onClick(View v) {
-            showOptionsDialog(mDisplay);
+            showWifiDisplayOptionsDialog(mDisplay);
+        }
+    }
+
+    private class UnpairedWifiDisplayPreference extends Preference
+            implements Preference.OnPreferenceClickListener {
+        private final WifiDisplay mDisplay;
+
+        public UnpairedWifiDisplayPreference(Context context, WifiDisplay display) {
+            super(context);
+
+            mDisplay = display;
+            setTitle(display.getFriendlyDisplayName());
+            setSummary(com.android.internal.R.string.wireless_display_route_description);
+            setEnabled(display.canConnect());
+            if (isEnabled()) {
+                setOrder(ORDER_AVAILABLE);
+            } else {
+                setOrder(ORDER_UNAVAILABLE);
+                setSummary(R.string.wifi_display_status_in_use);
+            }
+            setOnPreferenceClickListener(this);
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            pairWifiDisplay(mDisplay);
+            return true;
         }
     }
 }
commit	b1ded62f3fd8afa2507fc8d284522019dc1e31e2	[log] [tgz]
author	David Christie <dnchrist@google.com>	Thu Nov 14 20:12:41 2013 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Thu Nov 14 20:12:42 2013 +0000
tree	6d8bf6a36f880db8df1f394577a6136731c8196e
parent	9b28d5a0c3a6ac46a55a5c8c3b10791494fd61c5 [diff]
parent	587e6bf3fcfc8dffb4cf021227d896ffcb5488a9 [diff]