diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 12af5c4..9dce9ab 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -114,7 +114,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_eap_method:3 (435667726254379514) -->
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"PEAP"</item>
+    <item msgid="7981731051382306293">"TLS"</item>
+    <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"DOW"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Druk knoppie"</item>
     <item msgid="1624323946324499595">"PIN van eweknietoestel"</item>
@@ -159,7 +164,12 @@
     <item msgid="3703676222230317933">"Bekendstelling-aftelling"</item>
     <item msgid="2502754479975776899">"Programnaam"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:3 (2318274046749286642) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"DOW"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Geen"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 1306862..77ea67b 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kon nie die instelling verander nie"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Voeg netwerk by"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netwerke"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-drukknoppie"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN-kode"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skandeer"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Gevorderd"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Koppel aan netwerk"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Wysig netwerk"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Om beskikbare netwerke te sien, skakel Wi-Fi aan."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Wys gevorderde opsies"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi-beskermde opstelling"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS begin..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Druk die WPS-knoppie op jou Wi-Fi-roeteerder. Die opstelling kan tot twee minute neem om te voltooi."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"OK tik pin <xliff:g id="PIN">%1$s</xliff:g> op jou Wi-Fi-roeteerder in. Die opstelling kan tot twee minute neem om te voltooi."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS opgevolg. Koppel tans aan die netwerk..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Gekoppel aan Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS is reeds besig en kan tot twee minute neem om te voltooi"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS het misluk. Probeer asseblief oor \'n paar minute weer."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Die koordlose roeteerder-sekuriteitsinstelling (WEP) word nie ondersteun nie"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Die koordlose roeteerder-sekuriteitsinstelling (TKIP) word nie ondersteun nie"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Stawingmislukking. Probeer asseblief weer."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Nog WPS-sessie is opgespoor. Probeer asseblief oor \'n paar minute weer."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Netwerk-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sekuriteit"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Seinsterkte"</string>
@@ -569,14 +555,11 @@
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", beveilig met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Geen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Koppel"</string>
-    <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
-    <skip />
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Netwerkverbinding het misluk"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeet"</string>
-    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
-    <skip />
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Kon netwerk nie vergeet nie"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Stoor"</string>
-    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
-    <skip />
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Netwerkstoring het misluk"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Kanselleer"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Gevorderde Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frekwensieband"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 7208a7b..3d3bc60 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"ቅንብሮቹን ለመለወጥ ችግር ነበር።"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"አውታረ መረብ አክል"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"የWi-Fi  አውታረመረቦች"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS ግፊት አዘራር"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS ፒን ማስገቢያ"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ቃኝ"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"ከፍተኛ"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ወደ አውታረ መረብ አያይዝ"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"አውታረ መረብ ቀይር"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"ያሉ አውታረመረቦች ለማየት፣Wi-Fi አብራ።"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"የላቁ አማራጮችን አሳይ"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"በገመድ አልባ የተጠበቀ መዋቅር"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS በመጀመር ላይ…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"በገመድ አልባው ማዞሪያህ ላይ ያለው የWPS አዘራሩን ግፋ። ዝግጅቱ እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ሊፈጅ ይችላል።"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"በገምድ አልባው ማዞሪያህ ላይ የ<xliff:g id="PIN">%1$s</xliff:g> ፒንህ አስገባ። ዝግጅቱ እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊፈጅ ይችላል።"</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS ተሳክቷል። ከአውታረ መረቡ ጋር በመገናኘት ላይ…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"ከ<xliff:g id="NETWORK_NAME">%s</xliff:g> ገመድ-አልባ አውታረ መረብ ጋር ተገናኝቷል"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS አስቀድሞ በሂድት ላይ ነውና እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊፈጅ ይችላል"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS አልተሳካም። እባክህ ከጥቂት ደቂቃዎች በኋላ እንደገና ሞክር።"</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"የገመድ አልባው የማዞሪያ ድህንነት ቅንጅት (WEP) አይደገፍም"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"የገመድ አልባው የማዞሪያ ድህንነት ቅንጅት (TKIP) አይደገፍም"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"የማረጋገጥ አለመሳካት። እባክህ እንደገና ሞክር።"</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"ሌላ የWPS ክፍለ ጊዜ ተገኝቷል። እባክህ ከጥቂት ደቂቃዎች በኋላ እንደገና ሞክር።"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"አውታረ መረብ SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"ደህንነት"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"የሲግናል ጥንካሬ"</string>
@@ -831,8 +817,8 @@
     <string name="master_clear_title" msgid="5907939616087039756">"የፋብሪካ ውሂብ ዳግም አስጀምር"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"በስልኩ ላይ ያለ ውሂብ ሁሉ ያጠፋል"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"በስልኩ ላይ ያለውን ውሂብ ሁሉ አጥፋ"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ይህ ከአንተ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:"\n\n<li>"ያንተ Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንጅቶች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል::"</string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ይህ ከአንተ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:"\n\n<li>"ያንተ Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንጅቶች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል::"</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ይህ ከአንተ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:"\n\n<li>"የአንተ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንጅቶች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል::"</string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ይህ ከአንተ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:"\n\n<li>"የአንተ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንጅቶች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል::"</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n" እርስዎ በአሁን ጊዜ የሚከተለው መለያዎች ውስጥ ገብተዋል፡"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ሙዚቃ"</li>\n<li>"ፎቶዎች"</li>\n<li>"ሌላ የተጠቃሚ ውሂብ"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ "\n\n"ለማጥራት፣"<b>"USBማከማቻ"</b>" መጥፋት ያስፈልገዋል።"</string>
@@ -843,7 +829,7 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"እንደ ሙዚቃ እና ፎቶዎች፣ ሁሉንም ውሂብ በSD ካርድ ላይ አጥፋ።"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ጡባዊ ዳግም አስጀምር"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ስልክ ድጋሚ አስጀምር"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"ሁሉም ያንተ የግል መረጃ እና የወረዱ መተግበሪያዎች ይሰረዙ? ይህን እርማጃ መቀልበስ አትችልም!"</string>
+    <string name="master_clear_final_desc" msgid="7209547812233487345">"ሁሉም የአንተ  የግል መረጃ እና የወረዱ መተግበሪያዎች ይሰረዙ? ይህን እርማጃ መቀልበስ አትችልም!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ሁሉንም አጥፋ"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"የራስዎን ቁልፍ መክፈቻ ስርዓተጥለት ይሳሉ"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"የፋብሪካ ውሂብ ዳግም አስጀምር ለማረጋገጥ የእንተን መክፈቻ ስርዓተ ጥለት መሳል ያስፈልግሃል።"</string>
@@ -969,8 +955,8 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"መተግበሪያ ቅንጅቶች"</string>
     <string name="install_applications" msgid="4872012136210802181">"ያልታወቁ ምንጮች"</string>
     <string name="install_unknown_applications" msgid="8149117044297868948">"ገበያ ነክ ያልሆኑ መተግበሪያዎችን ለመጫን ፍቀድ።"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"ያንተ ጡባዊ እና የግል ውሂብ ካልታወቁ ምንጮች በሚመጡ መተግበሪያዎች ለጥቃት የተጋለጡ ናቸው:: እነዚህን መተግበሪያዎች በመጠቀምህ ሊከሰት በሚችለው የጡባዊህ ጉዳት ወይም የውሂብ መጥፋት ሙሉ በሙሉ ሃላፊነቱን አንተ ብቻ ለመውሰድ ትስማማለህ::"</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"ያንተ ስልክ እና የግል ውሂብ ካልታወቁ ምንጭ መተግበሪያዎች ለሚደርሱ ጥቃቶች የተጋለጡ ናቸው:: እነዚህን መተግበሪያዎች መጠቀም በመቀጠልህ ለሚደርስ ማናቸውም ጉዳት ሆነ የውሂብ መጥፋት ሃላፊነቱን ሙሉ በሙሉ ለብቻህ እንደምትወስድ ትስማማለህ::"</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"የአንተ  ጡባዊ እና የግል ውሂብ ካልታወቁ ምንጮች በሚመጡ መተግበሪያዎች ለጥቃት የተጋለጡ ናቸው:: እነዚህን መተግበሪያዎች በመጠቀምህ ሊከሰት በሚችለው የጡባዊህ ጉዳት ወይም የውሂብ መጥፋት ሙሉ በሙሉ ሃላፊነቱን አንተ ብቻ ለመውሰድ ትስማማለህ::"</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"የአንተ  ስልክ እና የግል ውሂብ ካልታወቁ ምንጭ መተግበሪያዎች ለሚደርሱ ጥቃቶች የተጋለጡ ናቸው:: እነዚህን መተግበሪያዎች መጠቀም በመቀጠልህ ለሚደርስ ማናቸውም ጉዳት ሆነ የውሂብ መጥፋት ሃላፊነቱን ሙሉ በሙሉ ለብቻህ እንደምትወስድ ትስማማለህ::"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"የላቁ ቅንብሮች"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"ተጨማሪ የቅንጅቶች አማራጮ ች አንቃ"</string>
     <string name="application_info_label" msgid="5736524913065714880">"የመተግበሪያ መረጃ"</string>
@@ -1455,8 +1441,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"መለያ አስወግድ?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ይህን መለያ ማስወገድ ሁሉንም መልዕክቶቹን፣ እውቂያዎቹን፣ እና ከጡባዊው ውስጥ ሌላ ውሂብ ይሰርዛል!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ይህን መለያ ማስወገድ ሁሉንም መልዕክቶቹን፣ እውቂያዎቹን፣ እና ከስልኩ ውስጥ ያለ ሌላ ውሂብን ይሰርዛል!"</string>
-    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"ይህ መለያ በአንዳንድ መተግበሪያዎች ያስፈልጋል::  በቅንጅቶች &gt; ላይ  ምትኬ&amp; ዳግም አዘጋጅ ላይ  ወደ ፋብሪካው ነባሪዎች (ሁሉንም ያንተ የግል ውሂብ ይሰርዛል) ጡባዊውን ዳግም በማዘጋጀት ብቻ ልታስወግደው ትችላለህ::"</string>
-    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"ይህ መለያ በአንዳንድ መተግበሪያዎች ያስፈልጋል::  በቅንጅቶች &gt; ላይ  ምትኬ&amp; ዳግም አዘጋጅ ላይ  ወደ ፋብሪካው ነባሪዎች (ሁሉንም ያንተ የግል ውሂብ ይሰርዛል) ስልኩን ዳግም በማዘጋጀት ብቻ ልታስወግደው ትችላለህ::"</string>
+    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"ይህ መለያ በአንዳንድ መተግበሪያዎች ያስፈልጋል::  በቅንጅቶች &gt; ላይ  ምትኬ&amp; ዳግም አዘጋጅ ላይ  ወደ ፋብሪካው ነባሪዎች (ሁሉንም የአንተ  የግል ውሂብ ይሰርዛል) ጡባዊውን ዳግም በማዘጋጀት ብቻ ልታስወግደው ትችላለህ::"</string>
+    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"ይህ መለያ በአንዳንድ መተግበሪያዎች ያስፈልጋል::  በቅንጅቶች &gt; ላይ  ምትኬ&amp; ዳግም አዘጋጅ ላይ  ወደ ፋብሪካው ነባሪዎች (ሁሉንም የአንተ  የግል ውሂብ ይሰርዛል) ስልኩን ዳግም በማዘጋጀት ብቻ ልታስወግደው ትችላለህ::"</string>
     <string name="provider_label" msgid="7724593781904508866">"ምዝገባዎችላይ ተጫን"</string>
     <string name="sync_item_title" msgid="1931551540462877488">"<xliff:g id="AUTHORITY">%s</xliff:g> አስምር"</string>
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"በእጅ ማመሳሰል አልተቻለም"</string>
@@ -1517,8 +1503,8 @@
     <string name="data_usage_empty" msgid="8621855507876539282">"በዚህ ጊዜ ውስጥ ምንም መተግበሪያዎች ውሂብ ጥቅም ላይ አልዋሉም።"</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"ቅድመ ገፅ"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"መደብ"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"ባንተ ጡባዊ ተኮ መሰረት ይሰፈራል:: ያንተ ማጓጓዣ ውሂብ አጠቃቀም ሒሳብ ማስያ ሊለያይ ይችላል::"</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"ባንተ ስልክ መሰረት ይሰፈራል:: ያንተ ማጓጓዣ ውሂብ አጠቃቀም ሒሳብ ማስያ ሊለያይ ይችላል::"</string>
+    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"ባንተ ጡባዊ ተኮ መሰረት ይሰፈራል:: የአንተ  ማጓጓዣ ውሂብ አጠቃቀም ሒሳብ ማስያ ሊለያይ ይችላል::"</string>
+    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"ባንተ ስልክ መሰረት ይሰፈራል:: የአንተ  ማጓጓዣ ውሂብ አጠቃቀም ሒሳብ ማስያ ሊለያይ ይችላል::"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"የተንቀሳቃሽ ስልክ ውሂብ ይቦዝን?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"የተንቀሳቃሽ ስልክ ውሂብ ወሰን አዘጋጅ"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"የ4G ውሂብ ወሰን አዘጋጅ"</string>
@@ -1547,8 +1533,8 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"የውሂብ አጠቃቀም ማስጠንቀቂያ አዘጋጅ"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"የውሂብ አጠቃቀም ወሰን አዘጋጅ"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"የውሂብ አጠቃቀም መወሰን"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"ያንተ <xliff:g id="NETWORKS">%1$s</xliff:g> ውሂብ ግንኙነት የተጠቀሰው ገደብ ላይ ሲደረስ ይቦዝናል፡፡ "\n\n"የውሂብ አጠቃቀም ባንተ ጡባዊ ተኮ መሰረት የሚሰፈር እንደመሆኑ፣ ያንተ ማጓጓዣ ለአጠቃቀም በተለየ ሁኔታ፣ ወግ አጥባቂ የሆነ ገደብ መጠቀምህን ከግምት አስገባ፡፡"</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"ያንተ <xliff:g id="NETWORKS">%1$s</xliff:g> ውሂብ ግንኙነት የተጠቀሰው ገደብ ላይ ሲደረስ ይቦዝናል፡፡ "\n\n"የውሂብ አጠቃቀም ባንተ ስልክ መሰረት የሚሰፈር እንደመሆኑ፣ ያንተ ማጓጓዣ ለአጠቃቀም በተለየ ሁኔታ፣ ወግ አጥባቂ የሆነ ገደብ መጠቀምህን ከግምት አስገባ፡፡"</string>
+    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"የአንተ  <xliff:g id="NETWORKS">%1$s</xliff:g> ውሂብ ግንኙነት የተጠቀሰው ገደብ ላይ ሲደረስ ይቦዝናል፡፡ "\n\n"የውሂብ አጠቃቀም ባንተ ጡባዊ ተኮ መሰረት የሚሰፈር እንደመሆኑ፣ የአንተ  ማጓጓዣ ለአጠቃቀም በተለየ ሁኔታ፣ ወግ አጥባቂ የሆነ ገደብ መጠቀምህን ከግምት አስገባ፡፡"</string>
+    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"የአንተ  <xliff:g id="NETWORKS">%1$s</xliff:g> ውሂብ ግንኙነት የተጠቀሰው ገደብ ላይ ሲደረስ ይቦዝናል፡፡ "\n\n"የውሂብ አጠቃቀም ባንተ ስልክ መሰረት የሚሰፈር እንደመሆኑ፣ የአንተ  ማጓጓዣ ለአጠቃቀም በተለየ ሁኔታ፣ ወግ አጥባቂ የሆነ ገደብ መጠቀምህን ከግምት አስገባ፡፡"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"በስተጀርባ ውሂብ አግድ?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"የተንቀሳቃሽ ውሂብ ዳራን ከገደብከው ወደ Wi-Fi አውታረመረብ ካልተገናኘህ በቀር አንዳንድ መተግበሪያዎች እና አገልግሎቶች አይሰሩም::"</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ማስጠንቀቂያ  "</font></string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 360f53f..68aef3a 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"حدثت مشكلة أثناء تغيير الإعدادات"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"إضافة شبكة"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"شبكات Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"زر دفع WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"إدخال رقم التعريف الشخصي في WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"فحص"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"متقدم"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"اتصال بالشبكة"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"تعديل الشبكة"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"لمشاهدة الشبكات المتاحة، شغّل Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"عرض الخيارات المتقدمة"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"إعداد Wi-Fi المحمي"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"جارٍ بدء WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"اضغط على زر WPS على جهاز توجيه Wi-Fi. يمكن أن يستغرق اكتمال الإعداد فترة قد تصل إلى دقيقتين."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"أدخل رقم التعريف الشخصي <xliff:g id="PIN">%1$s</xliff:g> في جهاز توجيه Wi-Fi. يمكن أن يستغرق إكمال الإعداد فترة قد تصل إلى دقيقتين."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"نجحت عملية WPS. جارٍ الاتصال بالشبكة…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"تم الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"عملية WPS قيد التقدم فعلاً ويمكن أن يستغرق اكتمالها فترة قد تصل إلى دقيقتين"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"أخفقت عملية WPS. يرجى إعادة المحاولة خلال بضع دقائق."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"إعداد أمان جهاز التوجيه اللاسلكي (WEP) ليس متوافقًا"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"إعداد أمان جهاز التوجيه اللاسلكي (TKIP) ليس متوافقًا"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"أخفقت المصادقة. الرجاء إعادة المحاولة."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"تم اكتشاف جلسة WPS أخرى، الرجاء إعادة المحاولة خلال بضع دقائق."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID للشبكة"</string>
     <string name="wifi_security" msgid="6603611185592956936">"الأمان"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"قوة الإشارة"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 0c3bba9..bfcfa4b 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Была праблема змены налад"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Дадаць сетку"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Сеткі Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Кнопка WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Увод PIN-кода WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Сканаваць"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Пашыраныя налады"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Падлучыцца да сеткі"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Змяніць сетку"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Каб праглядзець даступныя сеткi, уключыце Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Паказаць дадатковыя параметры"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Абароненая ўсталёўка Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Запускаецца WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Націсніце кнопку WPS на маршрутызатары Wi-Fi. Усталёўка можа заняць да дзвюх хвілін."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Увядзіце код <xliff:g id="PIN">%1$s</xliff:g> для маршрутызатара Wi-Fi. Усталёўка можа заняць да дзвюх хвілін."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Атрымалася ўключыць WPS. Падключэнне да сеткі..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Падключэнне да сеткі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS ужо запушчаны, гэта можа заняць да дзвюх хвілін"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Не атрымалася ўсталяваць WPS. Паўтарыце спробу праз некалькі хвілін."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Налады бяспекі бесправаднога маршрутызатара (WEP) не падтрымліваюцца"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Налады бяспекі бесправаднога маршрутызатара (TKIP) не падтрымліваюцца"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Памылка аўтэнтыфікацыі. Паўтарыце спробу."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Iншыя сеансы WPS не знойдзены. Паўтарыце спробу праз некалькі хвілін."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Ідэнтыфікатар SSID сеткі"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Бяспека"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Магутнасць сігнала"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 15ff62c..ad457b6 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -79,10 +79,34 @@
     <item msgid="4907380534957572531">"Висок"</item>
     <item msgid="4699640516390840297">"Много висок"</item>
   </string-array>
-    <!-- no translation found for wifi_status:10 (6367044185730295334) -->
-    <!-- no translation found for wifi_status:11 (503942654197908005) -->
-    <!-- no translation found for wifi_status_with_ssid:10 (5660739516542454527) -->
-    <!-- no translation found for wifi_status_with_ssid:11 (1805837518286731242) -->
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Сканира се..."</item>
+    <item msgid="8513729475867537913">"Установява се връзка…"</item>
+    <item msgid="515055375277271756">"Удостоверява се..."</item>
+    <item msgid="1943354004029184381">"Получава се IP адрес"</item>
+    <item msgid="4221763391123233270">"Установена е връзка"</item>
+    <item msgid="624838831631122137">"Прекъсната"</item>
+    <item msgid="7979680559596111948">"Изключва се..."</item>
+    <item msgid="1634960474403853625">"Изкл."</item>
+    <item msgid="746097431216080650">"Неуспешно"</item>
+    <item msgid="6367044185730295334">"Блокирано"</item>
+    <item msgid="503942654197908005">"Временно се избягва лоша връзка"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Сканира се..."</item>
+    <item msgid="355508996603873860">"Установява се връзка с/ъс <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"Удостоверява се с/ъс <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"IP адресът от <xliff:g id="NETWORK_NAME">%1$s</xliff:g> се получава..."</item>
+    <item msgid="8937994881315223448">"Установена е връзка с/ъс<xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Прекъсната"</item>
+    <item msgid="7698638434317271902">"Изключва се от <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"Изкл."</item>
+    <item msgid="8578370891960825148">"Неуспешно"</item>
+    <item msgid="5660739516542454527">"Блокирано"</item>
+    <item msgid="1805837518286731242">"Временно се избягва лоша връзка"</item>
+  </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
     <!-- no translation found for wifi_security:2 (1532568756571457140) -->
@@ -90,7 +114,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_eap_method:3 (435667726254379514) -->
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"PEAP"</item>
+    <item msgid="7981731051382306293">"TLS"</item>
+    <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"ПАРОЛА"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Бутон"</item>
     <item msgid="1624323946324499595">"ПИН от съответното устройство"</item>
@@ -135,7 +164,12 @@
     <item msgid="3703676222230317933">"Брой стартирания"</item>
     <item msgid="2502754479975776899">"Име на приложението"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:3 (2318274046749286642) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"ПАРОЛА"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Няма"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index c69b7c8..5da1ec1 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -569,14 +569,11 @@
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", защитено с <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Няма"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Свързване"</string>
-    <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
-    <skip />
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Свързването с мрежата не бе успешно"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Забравяне"</string>
-    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
-    <skip />
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Забравянето на мрежата не бе успешно"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Запазване"</string>
-    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
-    <skip />
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Запазването на мрежата не бе успешно"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Отказ"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Разширени настройки за Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Честотен спектър за Wi-Fi"</string>
@@ -1584,21 +1581,14 @@
     <string name="vpn_cancel" msgid="1979937976123659332">"Отказ"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Запазване"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Свързване"</string>
-    <!-- no translation found for vpn_edit (8647191407179996943) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (5965299358485793260) -->
-    <skip />
+    <string name="vpn_edit" msgid="8647191407179996943">"Потребителски профил за VPN: Редактиране"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Свързване със: <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <!-- no translation found for vpn_create (5628219087569761496) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (408275284159243490) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (8098021690546891414) -->
-    <skip />
-    <!-- no translation found for vpn_no_network (3050233675132726155) -->
-    <skip />
-    <!-- no translation found for vpn_missing_cert (7972907102570411501) -->
-    <skip />
+    <string name="vpn_create" msgid="5628219087569761496">"Потребителски профил за VPN: Добавяне"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Редактиране на потребителския профил"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Изтриване на потребителския профил"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Няма връзка с мрежата. Моля, опитайте отново по-късно."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Липсва сертификат. Моля, редактирайте потребителския профил."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Система"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Потребител"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Деактивиране"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4f143ef..7de7db5 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"S\'ha produït un problema en canviar la configuració"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Afegeix una xarxa"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Xarxes Wi-fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botó de pulsació de WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Introducció de PIN de WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Cerca"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançat"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connecta\'t a la xarxa"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifica la xarxa"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Per veure les xarxes disponibles, activa la Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostra les opcions avançades"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuració protegida de Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"S\'està iniciant WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Prem el botó WPS del router Wi-Fi router. La configuració pot trigar fins a dos minuts a completar-se."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Introdueix el pin <xliff:g id="PIN">%1$s</xliff:g> al router Wi-Fi. La configuració pot trigar fins a dos minuts a completar-se."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"La configuració de WPS s\'ha dut a terme correctament. S\'està connectant a la xarxa..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Connectat a la xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"La configuració de WPS ja s\'està executant i pot trigar fins a dos minuts a completar-se"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"S\'ha produït un error en iniciar WPS. Torna-ho a provar d\'aquí a una estona."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"La configuració de seguretat del router sense fils (WEP) no és compatible"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"La configuració de seguretat del router sense fils (TKIP) no és compatible"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Error d\'autenticació. Torna-ho a provar."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"S\'ha detectat una altra sessió de WPS. Torna-ho a provar d\'aquí a una estona."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID de xarxa"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguretat"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensitat del senyal"</string>
@@ -1581,7 +1567,7 @@
     <string name="vpn_cancel" msgid="1979937976123659332">"Cancel·la"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Desa"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Connecta"</string>
-    <string name="vpn_edit" msgid="8647191407179996943">"Edició d\'un perfil VPN"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"Edició d\'un perfil de VPN"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"Connexió amb <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Addició d\'un perfil de VPN"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9069c6f..66c9f2d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Při změně nastavení se vyskytl problém"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Přidat síť"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Sítě WiFi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tlačítko WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Zadání kódu WPS PIN"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Vyhledávání"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Pokročilé"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Připojit k síti"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upravit síť"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Chcete-li zobrazit dostupné sítě, zapněte síť Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Zobrazit pokročilé možnosti"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Chráněné nastavení Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Spouštění WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Stiskněte tlačítko WPS na vašem směrovači sítě Wi-Fi. Proces nastavení může trvat až dvě minuty."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Zadejte ve svém směrovači sítě Wi-Fi kód <xliff:g id="PIN">%1$s</xliff:g>. Proces nastavení může trvat až dvě minuty."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Spuštění WPS se podařilo. Probíhá připojení k síti..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Připojeno k síti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS probíhá a dokončení procesu může trvat až dvě minuty."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Spuštění WPS se nezdařilo. Zkuste to znovu za několik minut."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Nastavení zabezpečení bezdrátového směrovače (WEP) není podporováno"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Nastavení zabezpečení bezdrátového směrovače (TKIP) není podporováno"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Chyba ověření. Zkuste to prosím znovu."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Byla zjištěna další relace WPS. Zkuste prosím to znovu za několik minut."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Identifikátor SSID sítě"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpečení"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Síla signálu"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a63fdc9..028f5b8 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Der opstod et problem ved ændring af indstillingen"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Tilføj netværk"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netværk"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-trykknap"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Angiv WPS-pinkode"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanceret"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Opret forbindelse til netværk"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Rediger netværk"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Vis tilgængelige netværk ved at aktivere Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Vis avancerede valgmuligheder"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi-beskyttet konfiguration"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starter WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Tryk på WPS-knappen på din Wi-Fi-router. Konfigurationen kan tage op til to minutter at fuldføre."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Indtast pinkoden <xliff:g id="PIN">%1$s</xliff:g> på din Wi-Fi-router. Konfigurationen kan tage op til to minutter at fuldføre."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS godkendt. Opretter forbindelse til netværket..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Forbundet til Wi-Fi-netværket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS er allerede i gang og kan tage op til to minutter at fuldføre"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS mislykkedes. Prøv igen om nogle få minutter."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Sikkerhedsindstillingen til trådløse routere (WEP) understøttes ikke"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sikkerhedsindstillingen til trådløse routere (TKIP) understøttes ikke"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Godkendelsesfejl. Prøv igen."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"En anden WPS-session blev registreret. Prøv igen om et par minutter."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Netværk-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sikkerhed"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signalstyrke"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 85cd24d..84f9ab5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -505,10 +505,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Beim Ändern der Einstellung ist ein Problem aufgetreten."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Netzwerk hinzufügen"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"WLAN-Netzwerke"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-Push-Schaltfläche"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN-Eingabe"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scannen"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Erweitert"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Mit Netzwerk verbinden"</string>
@@ -516,30 +514,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Netzwerk ändern"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"WLAN aktivieren, um verfügbare Netze abzurufen"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Erweiterte Optionen einblenden"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Geschützte WLAN-Einrichtung"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS wird gestartet…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Drücken Sie die WPS-Taste an Ihrem WLAN-Router. Die Einrichtung kann bis zu 2 Minuten dauern."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Geben Sie die <xliff:g id="PIN">%1$s</xliff:g> auf Ihrem WLAN-Router ein. Die Einrichtung kann bis zu 2 Minuten dauern."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS erfolgreich. Netzwerkverbindung wird hergestellt…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Mit WLAN-Netzwerk <xliff:g id="NETWORK_NAME">%s</xliff:g> verbunden"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS ist bereits im Aufbau. Dies kann bis zu 2 Minuten dauern."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS fehlgeschlagen. Bitte versuchen Sie es in einigen Minuten erneut."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Die Sicherheitseinstellung für drahtlose Router (WEP) wird nicht unterstützt."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Die Sicherheitseinstellung für drahtlose Router (TKIP) wird nicht unterstützt."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authentifizierungsfehler. Bitte versuchen Sie es erneut."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Es wurde eine andere WPS-Sitzung gefunden. Bitte versuchen Sie es in einigen Minuten erneut."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Netzwerk-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sicherheit"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signalstärke"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index c573eb1..a3f0f21 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Προέκυψε κάποιο πρόβλημα κατά την αλλαγή της ρύθμισης"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Προσθήκη δικτύου"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Δίκτυα Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Κουμπί WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Εισαγ. κωδ. Pin WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Σάρωση"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Σύνθετα"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Σύνδεση στο δίκτυο"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Τροποποίηση δικτύου"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Για να δείτε τα διαθέσιμα δίκτυα, ενεργοποιήστε το Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Εμφάνιση σύνθετων επιλογών"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Ρύθμιση προστατευόμενου Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Έναρξη WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Πατήστε το κουμπί WPS στον δρομολογητή σας Wi-Fi. Η ολοκλήρωση της εγκατάστασης ενδέχεται να διαρκέσει έως και δύο λεπτά."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Εισαγάγετε τον κωδικό pin <xliff:g id="PIN">%1$s</xliff:g> στον δρομολογητή σας Wi-Fi. Η ολοκλήρωση της εγκατάστασης ενδέχεται να διαρκέσει έως και δύο λεπτά."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Επιτυχία WPS. Σύνδεση στο δίκτυο…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Σύνδεση στο δίκτυο Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Η ρύθμιση WPS βρίσκεται ήδη σε εξέλιξη και ενδεχομένως να χρειαστούν έως και δύο λεπτά προκειμένου να ολοκληρωθεί"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Αποτυχία WPS. Προσπαθήστε ξανά σε λίγα λεπτά."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Δεν υποστηρίζεται η ρύθμιση ασφάλειας ασύρματου δρομολογητή (WEP)"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Δεν υποστηρίζεται η ρύθμιση ασφάλειας ασύρματου δρομολογητή (TKIP)"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Αποτυχία ελέγχου ταυτότητας. Προσπαθήστε ξανά."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Έχει εντοπιστεί μια άλλη συνεδρία WPS. Προσπαθήστε ξανά σε λίγα λεπτά."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Δίκτυο SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Ασφάλεια"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Ισχύς σήματος"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 58c10a6..6a2fc19 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"There was a problem while changing the setting"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Add network"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi networks"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Push Button"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS Pin Entry"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Advanced"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connect to network"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modify network"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"To see networks available, turn Wi-Fi on."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Show advanced options"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi Protected Setup"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starting WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Push the WPS button on your Wi-Fi router. The setup can take up to two minutes to complete."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Enter pin <xliff:g id="PIN">%1$s</xliff:g> on your Wi-Fi router. The setup can take up to two minutes to complete."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS succeeded. Connecting to the network…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Connected to the Wi-Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS is already in progress and can take up to two minutes to complete"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Request failed. Please try again in a few minutes."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"The wireless router security setting (WEP) is not supported"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"The wireless router security setting (TKIP) is not supported"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authentication failure. Please try again."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Another WPS session was detected. Please try again in a few minutes."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Network SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Security"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signal strength"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index fabd677..d4fb054 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Hubo un problema mientras se cambiaba la configuración"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Agregar red"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Pulsador WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Intro. de PIN de WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Buscar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanzado"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar a la red"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar la red"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Para ver las redes disponibles, activar Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar las opciones avanzadas"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuración Wi-Fi protegida"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando la WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Presiona el botón WPS en tu enrutador Wi-Fi. La configuración puede demorar hasta dos minutos en completarse."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Ingresa el <xliff:g id="PIN">%1$s</xliff:g> en tu enrutador Wi-Fi. La configuración puede demorar hasta dos minutos en completarse."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"La WPS se inició correctamente. Estableciendo conexión con la red..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Se estableció conexión con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>."</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"La WPS se encuentra en curso y puede demorar hasta dos minutos en completarse."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"No se pudo iniciar la WPS. Vuelve a intentarlo en unos minutos."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"No se admite la configuración de la seguridad del enrutador inalámbrico (WEP)."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"No se admite la configuración de la seguridad del enrutador inalámbrico (TKIP)."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Se produjo un error al realizar la autenticación. Vuelve a intentarlo."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Se detectó otra sesión WPS. Vuelve a intentarlo en unos minutos."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Red SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Potencia de la señal"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b777dbb..c0c5537 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Error al cambiar la configuración"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Añadir red"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botón push WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"PIN WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Buscar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Ajustes avanzados"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Establecer conexión con red"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar red"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Para ver redes disponibles, activa la conexión Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar opciones avanzadas"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuración WPS"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando configuración WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Pulsa el botón WPS del router Wi-Fi. El proceso de configuración puede tardar unos dos minutos."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Introduce el <xliff:g id="PIN">%1$s</xliff:g> en el router Wi-Fi. El proceso de configuración puede tardar unos dos minutos."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"La configuración WPS se ha iniciado correctamente. Estableciendo conexión con la red…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Conexión establecida con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"El proceso WPS ya se ha iniciado y tiene una duración aproximada de dos minutos."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Se ha producido un error en la configuración WPS. Inténtalo de nuevo en unos minutos."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"No se admite el ajuste de seguridad del router inalámbrico (protocolo WEP)."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"No se admite el ajuste de seguridad del router inalámbrico (protocolo TKIP)."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Se ha producido un error de autenticación. Inténtalo de nuevo."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Se ha detectado otra configuración WPS. Inténtalo de nuevo en unos minutos."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID de red"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensidad de la señal"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 7fa0a43..1cbdf7e 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Seade muutmisel tekkis probleem"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Võrgu lisamine"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"WiFi-võrgud"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-nupp"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-i kirje"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skannimine"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Täpsemalt"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Loo võrguühendus"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Võrgu muutmine"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Saadavate võrkude kuvamiseks lülitage WiFi sisse."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Kuva täpsemad valikud"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Kaitstud WiFi seadistamine"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS-i käivitamine …"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Vajutage WiFi-ruuteri WPS-i nuppu. Seadistuse lõpuleviimiseks võib kuluda kuni kaks minutit."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Sisestage WiFi-ruuteri <xliff:g id="PIN">%1$s</xliff:g>-kood. Seadistuse lõpulejõudmiseks võib kuluda kuni kaks minutit."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS õnnestus. Võrguga ühenduse loomine …"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Ühendatud WiFi-võrguga <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS on juba käimas ja selle lõpuleviimiseks võib kuluda kuni kaks minutit"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS ebaõnnestus. Proovige mõne minuti pärast uuesti."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Ruuteri turvaseadet (WEP) ei toetata"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Ruuteri turvaseadet (TKIP) ei toetata"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentimine ebaõnnestus. Proovige uuesti."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Tuvastati teine WPS-i seanss. Proovige mõne minuti pärast uuesti."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Võrgu SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Turvalisus"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signaali tugevus"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 8bb204e..62e167e 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -79,10 +79,34 @@
     <item msgid="4907380534957572531">"زیاد"</item>
     <item msgid="4699640516390840297">"بسیار زیاد"</item>
   </string-array>
-    <!-- no translation found for wifi_status:10 (6367044185730295334) -->
-    <!-- no translation found for wifi_status:11 (503942654197908005) -->
-    <!-- no translation found for wifi_status_with_ssid:10 (5660739516542454527) -->
-    <!-- no translation found for wifi_status_with_ssid:11 (1805837518286731242) -->
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"اسکن کردن..."</item>
+    <item msgid="8513729475867537913">"در حال اتصال…"</item>
+    <item msgid="515055375277271756">"در حال تأیید اعتبار..."</item>
+    <item msgid="1943354004029184381">"در حال دریافت آدرس IP..."</item>
+    <item msgid="4221763391123233270">"اتصال برقرار شد"</item>
+    <item msgid="624838831631122137">"معلق"</item>
+    <item msgid="7979680559596111948">"در حال قطع اتصال..."</item>
+    <item msgid="1634960474403853625">"اتصال قطع شد"</item>
+    <item msgid="746097431216080650">"ناموفق"</item>
+    <item msgid="6367044185730295334">"مسدود شده"</item>
+    <item msgid="503942654197908005">"جلوگیری موقت از اتصال ضعیف"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"اسکن کردن..."</item>
+    <item msgid="355508996603873860">"در حال اتصال به <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"در حال تأیید اعتبار با <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"در حال دریافت آدرس IP از <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="8937994881315223448">"متصل شد به <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"معلق"</item>
+    <item msgid="7698638434317271902">"اتصال قطع شد از <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"اتصال قطع شد"</item>
+    <item msgid="8578370891960825148">"ناموفق"</item>
+    <item msgid="5660739516542454527">"مسدود شده"</item>
+    <item msgid="1805837518286731242">"جلوگیری موقت از اتصال ضعیف"</item>
+  </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
     <!-- no translation found for wifi_security:2 (1532568756571457140) -->
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c477be9..fbd00d5 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"هنگام تغییر تنظیمات مشکلی رخ داد"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"افزودن شبکه"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"شبکه های Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"دکمه ارسال WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"ورودی پین WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"اسکن"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"پیشرفته"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"اتصال به شبکه"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"اصلاح کردن شبکه"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"برای مشاهده شبکه های در دسترس، Wi-Fi را روشن کنید."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"نمایش گزینه‌های پیشرفته"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"نصب Wi-Fi حفاظت شده"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"راه‌اندازی WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"دکمه WPS را از روتر Wi-Fi فشار دهید. تکمیل نصب حداکثر دو دقیقه طول می‌کشد."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"پین <xliff:g id="PIN">%1$s</xliff:g> را در روتر Wi-Fi وارد کنید. تکمیل نصب حداکثر دو دقیقه طول می‌کشد."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS انجام شد. درحال اتصال به شبکه…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"به شبکه Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> متصل شد"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS در حال انجام کار است و تکمیل آن حداکثر دو دقیقه طول می‌کشد"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS انجام نشد. لطفاً چند دقیقه دیگر دوباره امتحان کنید."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"تنظیمات امنیتی روتر بیسیم (WEP) پشتیبانی نمی‌شود"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"تنظیمات امنیتی روتر بیسیم (TKIP) پشتیبانی نمی‌شود"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"تأیید اعتبار انجام نشد. لطفاً دوباره امتحان کنید."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"یک جلسه WPS دیگر شناسایی شد. لطفاً پس از چند دقیقه دوباره امتحان کنید."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID شبکه"</string>
     <string name="wifi_security" msgid="6603611185592956936">"امنیت"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"قدرت سیگنال"</string>
@@ -1581,21 +1567,14 @@
     <string name="vpn_cancel" msgid="1979937976123659332">"لغو"</string>
     <string name="vpn_save" msgid="4233484051644764510">"ذخیره"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"اتصال"</string>
-    <!-- no translation found for vpn_edit (8647191407179996943) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (5965299358485793260) -->
-    <skip />
+    <string name="vpn_edit" msgid="8647191407179996943">"ویرایش نمایه VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"اتصال به <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <!-- no translation found for vpn_create (5628219087569761496) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (408275284159243490) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (8098021690546891414) -->
-    <skip />
-    <!-- no translation found for vpn_no_network (3050233675132726155) -->
-    <skip />
-    <!-- no translation found for vpn_missing_cert (7972907102570411501) -->
-    <skip />
+    <string name="vpn_create" msgid="5628219087569761496">"افزودن نمایه VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"ویرایش نمایه"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"حذف نمایه"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"اتصال شبکه موجود نیست. لطفاً دوباره امتحان کنید."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"یک گواهینامه موجود نیست. لطفاً نمایه را ویرایش کنید."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"سیستم"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"کاربر"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"غیرفعال کردن"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 2ad8b96..0fa3fdc 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Asetuksen vaihtaminen epäonnistui"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Lisää verkko"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wifi-verkot"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-painike"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Etsi"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Lisäasetukset"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Yhdistä verkkoon"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Muokkaa verkkoa"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Näet käytettävissä olevat verkot, kun otat wifin käyttöön."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Näytä lisäasetukset"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Suojatut wifi-asetukset"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Käynnistetään WPS:ää..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Paina wifi-reitittimen WPS-painiketta. Asennus voi kestää kaksi minuuttia."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Näppäile pin-koodi <xliff:g id="PIN">%1$s</xliff:g> wifi-reitittimeen. Asennus voi kestää kaksi minuuttia."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS onnistui. Muodostetaan yhteyttä verkkoon..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Yhdistetty wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS on jo käynnissä ja sen suorittaminen voi kestää kaksi minuuttia."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS epäonnistui. Yritä uudelleen muutaman minuutin kuluttua."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Langattoman reitittimen suojausasetusta (WEP) ei tueta."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Langattoman reitittimen suojausasetusta (TKIP) ei tueta."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Todennusvirhe. Yritä myöhemmin uudelleen."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Havaittiin toinen WPS-käyttökerta. Yritä uudelleen muutaman minuutin kuluttua."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Verkon SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Suojaus"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signaalin vahvuus"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 9c2b460..9614b87 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -114,7 +114,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_eap_method:3 (435667726254379514) -->
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"PEAP"</item>
+    <item msgid="7981731051382306293">"TLS"</item>
+    <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Appuyer sur le bouton"</item>
     <item msgid="1624323946324499595">"Code PIN de l\'appareil associé"</item>
@@ -159,7 +164,12 @@
     <item msgid="3703676222230317933">"Nombre de lancements"</item>
     <item msgid="2502754479975776899">"Nom de l\'application"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:3 (2318274046749286642) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Aucun"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 85fa0fc..811f504 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Un problème est survenu lors de la modification des paramètres."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ajouter un réseau"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Réseaux Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Bouton commande WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Saisie code PIN WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Rechercher"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Options avancées"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Se connecter au réseau"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifier le réseau"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Activez le Wi-Fi pour voir les réseaux disponibles."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Afficher les options avancées"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuration Wi-Fi protégée"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Démarrage de la configuration WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Appuyez sur le bouton WPS de votre routeur Wi-Fi. La configuration peut prendre jusqu\'à deux minutes."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Saisissez le code <xliff:g id="PIN">%1$s</xliff:g> sur votre routeur Wi-Fi. La configuration peut prendre jusqu\'à deux minutes."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Configuration WPS réussie. Connexion au réseau en cours…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Connecté au réseau Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"La configuration WPS est déjà en cours et peut prendre jusqu\'à deux minutes."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Échec de la configuration WPS. Veuillez réessayer dans quelques minutes."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"La configuration de sécurité du routeur sans fil (WEP) n\'est pas compatible."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"La configuration de sécurité du routeur sans fil (TKIP) n\'est pas compatible."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Échec de l\'authentification. Veuillez réessayer."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Une autre session WPS a été détectée. Veuillez réessayer dans quelques minutes."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID du réseau"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sécurité"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensité du signal"</string>
@@ -569,14 +555,11 @@
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Aucune"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Se connecter"</string>
-    <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
-    <skip />
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Échec de la connexion au réseau."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Retirer"</string>
-    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
-    <skip />
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Échec de la suppression du réseau."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Enregistrer"</string>
-    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
-    <skip />
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Échec de l\'enregistrement du réseau."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annuler"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Paramètres Wi-Fi avancés"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Plage de fréquences Wi-Fi"</string>
@@ -1178,9 +1161,9 @@
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Ces paramètres sont en cours de développement. Ils peuvent endommager votre appareil et les applications qui s\'y trouvent, ou provoquer leur dysfonctionnement."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Choisir un gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Choisir un widget"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> j <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> mn <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> mn <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> mn <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> j <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Données statistiques"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Données statistiques"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 3c34244..fd58145 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"सेटिंग बदलने में एक समस्‍या थी"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"नेटवर्क जोड़ें"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi नेटवर्क"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS पुश बटन"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS पिन प्रविष्टि"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"स्कैन करें"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"उन्नत"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"नेटवर्क से कनेक्‍ट करें"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"नेटवर्क संशोधित करें"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"उपलब्‍ध नेटवर्क देखने के लिए, Wi-Fi को चालू करें."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"उन्नत विकल्प दिखाएं"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi सुरक्षित सेटअप"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS प्रारंभ हो रहा है…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"अपने Wi-Fi राउटर पर WPS बटन पुश करें. सेटअप पूर्ण होने में दो मिनट लग सकते हैं."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"अपने  Wi-F राउटर पर पिन <xliff:g id="PIN">%1$s</xliff:g> दर्ज करें. सेटअप पूर्ण होने में दो मिनट लग सकते हैं."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS सफल रहा. नेटवर्क से कनेक्‍ट हो रहा है…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Wi-Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्‍ट किया गया"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS पहले से ही प्रगति में है और पूर्ण होने में दो मिनट लग सकते हैं"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS विफल रहा. कृपया कुछ मिनटों में पुन: प्रयास करें."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"वायरलेस राउटर सुरक्षा सेटिंग (WEP) समर्थित नहीं है"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"वायरलेस राउटर सुरक्षा सेटिंग (TKIP) समर्थित नहीं है"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"प्रमाणीकरण विफल. कृपया पुन: प्रयास करें."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"अन्‍य WPS सत्र का पता चला. कृपया कुछ मिनटों में पुन: प्रयास करें."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"नेटवर्क SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"सुरक्षा"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"सिग्‍नल शक्ति"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 3fb567c..bdb030a 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Pojavio se problem s promjenom postavke"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj mrežu"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi mreže"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS gumb"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Unos WPS PIN-a"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skeniraj"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Napredno"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Poveži s mrežom"</string>
@@ -515,30 +513,19 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Izmijeni mrežu"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Da biste vidjeli dostupne mreže, uključite Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Prikaži napredne opcije"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Postavljanje zaštićene mreže Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Pokretanje WPS-a..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Pritisnite gumb WPS gumb na usmjerivaču mreže Wi-Fi. Do dovršetka postavljanja može proteći do dvije minute."</string>
     <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
     <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS uspio. Povezivanje s mrežom…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Povezano s mrežom Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Već je u tijeku WPS, a do dovršetka može proteći do dvije minute"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Zahtjev nije uspio. Pokušajte ponovo za nekoliko minuta."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Sigurnosna postavka (WEP) bežičnog usmjerivača nije podržana"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sigurnosna postavka bežičnog usmjerivača (TKIP) nije podržana"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentifikacija nije uspjela. Pokušajte ponovo."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Otkrivena je još jedna WPS sesija. Pokušajte ponovo za nekoliko minuta."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Mrežni SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sigurnost"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Jakost signala"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index cdeb764..ae1f4cf 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Probléma adódott a beállítás megváltoztatásakor"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Hálózat hozzáadása"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi hálózatok"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS gomb"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN kód megadása"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Keresés"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Speciális"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Csatlakozás hálózathoz"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Hálózat módosítása"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Kapcsolja be a WiFi-t a hálózatok megjelenítéséhez"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Speciális beállítások megjelenítése"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"WPS"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS indítása..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Nyomja meg a WPS gombot a Wi-Fi routeren. A telepítés legfeljebb 2 percet vesz igénybe."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Írja be a Wi-Fi router azonosítókódját (<xliff:g id="PIN">%1$s</xliff:g>). A telepítés legfeljebb 2 percet vesz igénybe."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Sikeres WPS. Csatlakozás a hálózathoz..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Csatlakozva a(z) <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi hálózathoz"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"A WPS már folyamatban van, és legfeljebb 2 percet vesz igénybe."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Sikertelen WPS. Kérjük, próbálkozzon újra néhány perc múlva."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"A vezeték nélküli router biztonsági beállítása (WEP) nem támogatott."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"A vezeték nélküli router biztonsági beállítása (TKIP) nem támogatott."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Azonsítási hiba. Kérjük, próbálja újra."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Egy másik WPS-munkamenetet észleltünk. Kérjük, próbálkozzon újra néhány perc múlva."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Hálózati SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Biztonság"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Jelerősség"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index ffdb6c4..b010c4f 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -79,10 +79,34 @@
     <item msgid="4907380534957572531">"Tinggi"</item>
     <item msgid="4699640516390840297">"Sangat tinggi"</item>
   </string-array>
-    <!-- no translation found for wifi_status:10 (6367044185730295334) -->
-    <!-- no translation found for wifi_status:11 (503942654197908005) -->
-    <!-- no translation found for wifi_status_with_ssid:10 (5660739516542454527) -->
-    <!-- no translation found for wifi_status_with_ssid:11 (1805837518286731242) -->
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Memindai..."</item>
+    <item msgid="8513729475867537913">"Menyambung…"</item>
+    <item msgid="515055375277271756">"Mengautentikasi…"</item>
+    <item msgid="1943354004029184381">"Mendapatkan alamat IP…"</item>
+    <item msgid="4221763391123233270">"Terhubung"</item>
+    <item msgid="624838831631122137">"Ditangguhkan"</item>
+    <item msgid="7979680559596111948">"Memutus sambungan..."</item>
+    <item msgid="1634960474403853625">"Sambungan terputus"</item>
+    <item msgid="746097431216080650">"Gagal"</item>
+    <item msgid="6367044185730295334">"Dicekal"</item>
+    <item msgid="503942654197908005">"Menghindari sambungan buruk untuk sementara"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Memindai..."</item>
+    <item msgid="355508996603873860">"Menyambung ke <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Mengautentikasi dengan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Mendapatkan alamat IP dari <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Tersambung ke <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Ditangguhkan"</item>
+    <item msgid="7698638434317271902">"Diputus dari <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Sambungan terputus"</item>
+    <item msgid="8578370891960825148">"Gagal"</item>
+    <item msgid="5660739516542454527">"Dicekal"</item>
+    <item msgid="1805837518286731242">"Menghindari sambungan buruk untuk sementara"</item>
+  </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
     <!-- no translation found for wifi_security:2 (1532568756571457140) -->
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 3ab8c15..e351417 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -136,7 +136,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Permintaan penyandingan bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Permintaan penyandingan"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Sentuh untuk menyandingkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Tampilkan berkas yang diterima"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Tampilkan file yang diterima"</string>
     <string name="device_picker" msgid="8398232791303186677">"Pemilih perangkat bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Permintaan izin bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Sebuah apl ingin menghidupkan Bluetooth. Izinkan?"</string>
@@ -157,7 +157,7 @@
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Permintaan buku telepon"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s ingin mengakses kenalan dan riwayat panggilan Anda. Berikan akses ke %2$s?"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Jangan tanya lagi"</string>
-    <string name="date_and_time" msgid="4114084177056654663">"Setelan tanggal &amp; waktu"</string>
+    <string name="date_and_time" msgid="4114084177056654663">"Pengaturan tanggal &amp; waktu"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1.00 pm"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13.00"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pilih zona waktu"</string>
@@ -171,7 +171,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Mulai <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Akun:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Setelan proxy"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Pengaturan proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Bersihkan"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Porta proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Abaikan proxy untuk"</string>
@@ -187,7 +187,7 @@
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"Anda perlu melengkapi bidang port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Bidang port harus kosong jika bidang inang 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 peramban, namun tidak boleh digunakan oleh apl lain."</string>
+    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP digunakan oleh browser, namun tidak boleh digunakan oleh apl lain."</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_data_attempts_label" msgid="1731106244577323381">"Upaya data:"</string>
@@ -218,7 +218,7 @@
     <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Perbarui"</string>
     <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"Segarkan"</string>
     <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"Aktifkan cek DNS"</string>
-    <string name="oem_radio_info_label" msgid="6163141792477958941">"Setelan/Info spesifik OEM"</string>
+    <string name="oem_radio_info_label" msgid="6163141792477958941">"Pengaturan/Info spesifik OEM"</string>
     <string name="band_mode_title" msgid="954174198903776205">"Setel jaringan GSM//UMTS"</string>
     <string name="band_mode_loading" msgid="548764766363847336">"Memuat daftar jaringan..."</string>
     <string name="band_mode_set" msgid="5730560180249458484">"Setel"</string>
@@ -252,11 +252,11 @@
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"Info telepon"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Penyimpanan USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Kartu SD"</string>
-    <string name="proxy_settings_label" msgid="3271174136184391743">"Setelan proxy"</string>
+    <string name="proxy_settings_label" msgid="3271174136184391743">"Pengaturan proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Batal"</string>
-    <string name="settings_label" msgid="1626402585530130914">"Setelan"</string>
-    <string name="settings_label_launcher" msgid="8344735489639482340">"Setelan"</string>
-    <string name="settings_shortcut" msgid="3936651951364030415">"Pintasan setelan"</string>
+    <string name="settings_label" msgid="1626402585530130914">"Pengaturan"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Pengaturan"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Pintasan pengaturan"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Mode pesawat"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Selengkapnya..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Jaringan &amp; nirkabel"</string>
@@ -306,8 +306,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Memerlukan PIN atau sandi angka untuk mengurai enkripsi tablet tiap kali Anda menyalakannya"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Memerlukan PIN atau sandi angka untuk mengurai enkripsi ponsel tiap kali Anda menyalakannya"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Dienkripsi"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Anda dapat mengenkripsi akun, setelan, apl yang diunduh dan datanya, media, serta berkas lainnya. Setelah mengenkripsi tablet, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menyalakannya: Anda tidak dapat membatalkan enkripsi tablet kecuali dengan mengembalikannya ke setelan pabrik yang akan menghapus seluruh data Anda."\n\n"Enkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan tablet dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data Anda."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Anda dapat mengenkripsi akun, setelan, apl yang diunduh dan datanya, media, serta berkas lainnya. Setelah mengenkripsi ponsel, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menghidupkannya: Anda tidak dapat membatalkan enkripsi ponsel kecuali dengan mengembalikan ke setelan pabrik dan akan menghapus seluruh data Anda."\n\n"Enkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan ponsel dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data Anda."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Anda dapat mengenkripsi akun, pengaturan, apl yang diunduh dan datanya, media, serta file lainnya. Setelah mengenkripsi tablet, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menyalakannya: Anda tidak dapat membatalkan enkripsi tablet kecuali dengan mengembalikannya ke pengaturan pabrik yang akan menghapus seluruh data Anda."\n\n"Enkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan tablet dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data Anda."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Anda dapat mengenkripsi akun, pengaturan, apl yang diunduh dan datanya, media, serta file lainnya. Setelah mengenkripsi ponsel, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menghidupkannya: Anda tidak dapat membatalkan enkripsi ponsel kecuali dengan mengembalikan ke pengaturan pabrik dan akan menghapus seluruh data Anda."\n\n"Enkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan ponsel dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data Anda."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Enkripsi tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Enkripsi ponsel"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Isi daya baterai Anda dan coba lagi."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Coba lagi dalam <xliff:g id="DELAY">^1</xliff:g> detik."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ketikkan sandi Anda"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripsi gagal"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet Anda tidak dapat diakses lagi. "\n\n" Untuk terus menggunakan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel Anda tidak dapat diakses lagi. "\n\n" Untuk terus menggunakan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet Anda tidak dapat diakses lagi. "\n\n" Untuk terus menggunakan tablet, Anda perlu mengembalikannya ke pengaturan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke pengaturan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel Anda tidak dapat diakses lagi. "\n\n" Untuk terus menggunakan ponsel, Anda perlu mengembalikannya ke pengaturan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke pengaturan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pilih kunci layar"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pilih gembok cadangan"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Gembok layar"</string>
@@ -444,7 +444,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Sambungkan ke…"</string>
     <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio media"</string>
     <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio telepon"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transfer berkas"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transfer file"</string>
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Perangkat masukan"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Akses Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Berbagi sambungan internet"</string>
@@ -459,24 +459,24 @@
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Sambungkan ke perangkat Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profil"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Ganti nama"</string>
-    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Izinkan transfer berkas masuk"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Izinkan transfer file masuk"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Tersambung ke media audio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Tersambung ke audio ponsel"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Sambungkan ke server transfer berkas"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Tidak tersambung kepada server transfer berkas"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Sambungkan ke server transfer file"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Tidak tersambung kepada server transfer file"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Terhubung ke perangkat masukan"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Tersambung ke perangkat untuk akses Internet"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Berbagi sambungan Internet lokal dengan perangkat"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Gunakan untuk audio media"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Gunakan untuk audio ponsel"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gunakan untuk transfer berkas"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gunakan untuk transfer file"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gunakan untuk masukan"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Digunakan untuk akses internet"</string>
-    <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Setelan Dok"</string>
+    <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Pengaturan Dok"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Gunakan dok untuk audio"</string>
     <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="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat pengaturan"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" msgid="5237208142892767592">"Memungkinkan pertukaran data saat ponsel bersentuhan dengan perangkat lain"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
@@ -484,11 +484,11 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Mati"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Tidak tersedia karena NFC dimatikan"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Jika fitur ini dihidupkan, Anda dapat memancarkan konten apl ke perangkat berkemampuan NFC lainnya dengan mendekatkan kedua perangkat. Contohnya, Anda dapat memancarkan laman Peramban, video YouTube, data kenalan Orang, dan lain-lain."\n\n"Cukup dekatkan kedua perangkat (biasanya saling membelakangi) lalu sentuh layar Anda. Apl ini akan menentukan apa yang dipancarkan."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Jika fitur ini dihidupkan, Anda dapat memancarkan konten apl ke perangkat berkemampuan NFC lainnya dengan mendekatkan kedua perangkat. Contohnya, Anda dapat memancarkan laman Browser, video YouTube, data kenalan Orang, dan lain-lain."\n\n"Cukup dekatkan kedua perangkat (biasanya saling membelakangi) lalu sentuh layar Anda. Apl ini akan menentukan apa yang dipancarkan."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Hidupkan Wi-Fi"</string>
     <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Setelan Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="2810363951104753710">"Pengaturan Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Siapkan &amp; kelola titik akses nirkabel"</string>
     <string name="wifi_starting" msgid="6716593470710880000">"Hidupkan Wi-Fi…"</string>
@@ -501,13 +501,11 @@
     <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Hindari sambungan buruk"</string>
     <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Jangan gunakan jaringan Wi-Fi kecuali sambungan internetnya baik"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Terus nyalakan Wi-Fi selama dalam mode tidur"</string>
-    <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ada masalah saat mengubah setelan"</string>
+    <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ada masalah saat mengubah pengaturan"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Tambahkan jaringan"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Jaringan Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tombol Tekan WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Entri Pin WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Pindai"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Lanjutan"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Hubungkan ke jaringan"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ubah jaringan"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Utk melihat jaringan yg tersedia, hidupkan Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Tampilkan opsi lanjutan"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Penyiapan Wi-Fi yang Dilindungi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Memulai WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Tekan tombol WPS pada router Wi-Fi Anda. Penyiapan memerlukan waktu hingga dua menit untuk diselesaikan."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Masukkan pin <xliff:g id="PIN">%1$s</xliff:g> pada router Wi-Fi Anda. Penyiapan memerlukan waktu hingga dua menit untuk diselesaikan."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS berhasil. Menyambung ke jaringan..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Tersambung ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Penyiapan WPS sedang berlangsung dan memerlukan waktu hingga dua menit untuk menyelesaikannya."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Gagal memulai WPS. Coba lagi setelah beberapa menit."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Setelan keamanan router nirkabel (TKIP) tidak didukung"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Setelan keamanan router nirkabel (TKIP) tidak didukung"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentikasi gagal. Harap coba lagi."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Sesi WPS lainnya terdeteksi. Coba lagi setelah beberapa menit."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID jaringan"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Keamanan"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Kekuatan sinyal"</string>
@@ -553,14 +539,14 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitas anonim"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Sandi"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Tampilkan sandi"</string>
-    <string name="wifi_ip_settings" msgid="3359331401377059481">"Setelan IP"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Pengaturan IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(tidak diubah)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(tidak ditentukan)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Disimpan"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Nonaktif"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Koneksi internet buruk dihindari"</string>
     <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Jaringan ini dihindari karena koneksi buruk. Nonaktifkan perilaku ini dari layar Setelan &gt; Wi-Fi, item menu Lanjutan."</string>
+    <string name="wifi_disabled_help" msgid="5416325603334140666">"Jaringan ini dihindari karena koneksi buruk. Nonaktifkan perilaku ini dari layar Pengaturan &gt; Wi-Fi, item menu Lanjutan."</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Masalah autentikasi"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Tidak dalam jangkauan"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tersedia"</string>
@@ -581,7 +567,7 @@
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Ada masalah saat menyetel pita frekuensi."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Alamat MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Alamat IP"</string>
-    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Setelan IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Pengaturan IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Simpan"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Batal"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"Ketikkan alamat IP yang valid."</string>
@@ -627,7 +613,7 @@
     <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Setel volume untuk musik dan video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
-    <string name="dock_settings_summary" msgid="455802113668982481">"Setelan audio untuk dok terpasang"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"Pengaturan audio untuk dok terpasang"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Nada sentuh dial pad"</string>
     <string name="sound_effects_enable_title" msgid="1171590821131077296">"Suara sentuh"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"Suara kunci layar"</string>
@@ -638,13 +624,13 @@
     <string name="volume_notification_description" msgid="5810902320215328321">"Pemberitahuan"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Alarm"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dok"</string>
-    <string name="dock_settings_title" msgid="9161438664257429372">"Setelan dok"</string>
+    <string name="dock_settings_title" msgid="9161438664257429372">"Pengaturan dok"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
-    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Setelan untuk dok desktop terpasang"</string>
-    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Setelan untuk dok mobil terpasang"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Pengaturan untuk dok desktop terpasang"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Pengaturan untuk dok mobil terpasang"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet tidak digalangkan"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telepon tidak berada di dok"</string>
-    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Setelan untuk dok terpasang"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Pengaturan untuk dok terpasang"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dok tidak ditemukan"</string>
     <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Anda perlu menghubungkan tablet dengan dok sebelum menyiapkan audio dok."</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Anda perlu menghubungkan ponsel dengan dok sebelum menyiapkan audio dok."</string>
@@ -655,7 +641,7 @@
     <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Jangan putar suara ketika memasang atau melepas ponsel dari dok"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Sinkronisasi &amp; akun"</string>
     <string name="search_settings" msgid="1910951467596035063">"Telusuri"</string>
-    <string name="search_settings_summary" msgid="9205656546570654169">"Kelola setelan dan riwayat penelusuran"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Kelola pengaturan dan riwayat penelusuran"</string>
     <string name="display_settings" msgid="7965901687241669598">"Tampilan"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Putar layar secara otomatis"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Ubah orientasi secara otomatis ketika memutar tablet"</string>
@@ -680,7 +666,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan otomatis"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukuran fon"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ukuran fon"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"Setelan kunci kartu SIM"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Pengaturan kunci kartu SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Siapkan kunci kartu SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Kunci kartu SIM"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Kunci kartu SIM"</string>
@@ -718,7 +704,7 @@
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Status baterai, jaringan, dan informasi lainnya"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"Nomor telepon, sinyal, dan sebagainya."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Penyimpanan"</string>
-    <string name="storage_settings_title" msgid="8746016738388094064">"Setelan penyimpanan"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Pengaturan penyimpanan"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Melepas penyimpanan USB, melihat penyimpanan yang tersedia"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Lepaskan kartu SD, lihat penyimpanan yang tersedia"</string>
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
@@ -783,10 +769,10 @@
     <string name="storage_title_usb" msgid="679612779321689418">"Koneksi komputer USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Sambungkan sebagai"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Perangkat media (MTP)"</string>
-    <string name="usb_mtp_summary" msgid="4617321473211391236">"Memungkinkan Anda mentransfer berkas media di Windows, atau menggunakan Transfer Berkas Android di Mac (lihat www.android.com/filetransfer)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Memungkinkan Anda mentransfer file media di Windows, atau menggunakan Transfer File Android di Mac (lihat www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
-    <string name="usb_ptp_summary" msgid="7673397474756664929">"Memungkinkan Anda mentransfer foto menggunakan perangkat lunak kamera, dan mentransfer berkas apa pun di komputer yang tidak mendukung MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Pasang alat transfer berkas"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Memungkinkan Anda mentransfer foto menggunakan perangkat lunak kamera, dan mentransfer file apa pun di komputer yang tidak mendukung MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Pasang alat transfer file"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status baterai"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Tingkat baterai"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -825,10 +811,10 @@
     <string name="error_apn_empty" msgid="6056233831214537267">"APN wajib diisi."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Bidang MCC harus terdiri dari 3 digit."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Bidang MNC harus 2 atau 3 digit."</string>
-    <string name="restore_default_apn" msgid="8178010218751639581">"Memulihkan setelan APN bawaan."</string>
+    <string name="restore_default_apn" msgid="8178010218751639581">"Memulihkan pengaturan APN bawaan."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Setel ulang ke bawaan"</string>
-    <string name="restore_default_apn_completed" msgid="2824775307377604897">"Penyetelan ulang setelan APN bawaan selesai."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Kembalikan ke setelan pabrik"</string>
+    <string name="restore_default_apn_completed" msgid="2824775307377604897">"Penyetelan ulang pengaturan APN bawaan selesai."</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"Kembalikan ke pengaturan pabrik"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Hapus semua data di tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Hapus semua data pada ponsel"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:"\n\n<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl unduhan"</li></string>
@@ -846,7 +832,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Hapus semua informasi pribadi dan apl unduhan Anda? Anda tidak dapat mengurungkan tindakan ini!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Hapus semua"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Buat pola pembuka kunci Anda"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi kembalikan ke setelan pabrik."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi kembalikan ke pengaturan pabrik."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Penyetelan ulang tidak dilakukan karena layanan System Clear tidak tersedia."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Setel ulang?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Hapus penyimpanan USB"</string>
@@ -857,13 +843,13 @@
     <string name="media_format_desc" product="default" msgid="8764037252319942415">"Hapus kartu SD? Anda akan kehilangan "<b>"semua"</b>" data dalam kartu!"</string>
     <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Hapus penyimpanan USB"</string>
     <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Hapus kartu SD"</string>
-    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Hapus penyimpanan USB beserta semua berkas yang tersimpan di sana? Anda tidak dapat mengurungkan tindakan ini!"</string>
-    <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Hapus kartu SD beserta semua berkas yang tersimpan di sana? Anda tidak dapat mengurungkan tindakan ini!"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Hapus penyimpanan USB beserta semua file yang tersimpan di sana? Anda tidak dapat mengurungkan tindakan ini!"</string>
+    <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Hapus kartu SD beserta semua file yang tersimpan di sana? Anda tidak dapat mengurungkan tindakan ini!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Hapus semua"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Buat pola pembuka kunci Anda"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi bahwa Anda ingin menghapus penyimpanan USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi bahwa Anda ingin menghapus kartu SD."</string>
-    <string name="call_settings_title" msgid="5188713413939232801">"Setelan panggilan"</string>
+    <string name="call_settings_title" msgid="5188713413939232801">"Pengaturan panggilan"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Siapkan kotak pesan, penerusan panggilan, nada tunggu, nomor penelepon"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Penambatan USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot portabel"</string>
@@ -966,13 +952,13 @@
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Mengelola dan menghapus apl terpasang"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apl"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Kelola apl, siapkan pintasan peluncuran cepat"</string>
-    <string name="applications_settings_header" msgid="1014813055054356646">"Setelan apl"</string>
+    <string name="applications_settings_header" msgid="1014813055054356646">"Pengaturan apl"</string>
     <string name="install_applications" msgid="4872012136210802181">"Sumber tidak dikenal"</string>
     <string name="install_unknown_applications" msgid="8149117044297868948">"Izinkan pemasangan apl selain Market"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tablet dan data pribadi Anda lebih rentan terhadap serangan apl dari sumber yang tidak dikenal. Anda setuju untuk bertanggung jawab penuh atas segala kerusakan pada tablet atau kehilangan data yang mungkin diakibatkan oleh penggunaan apl ini."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Ponsel dan data pribadi Anda lebih rentan terhadap serangan apl dari sumber yang tidak dikenal. Anda setuju untuk bertanggung jawab penuh atas segala kerusakan pada ponsel atau kehilangan data yang mungkin diakibatkan oleh penggunaan apl ini."</string>
-    <string name="advanced_settings" msgid="1777249286757067969">"Setelan lanjutan"</string>
-    <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktifkan opsi setelan yang lain"</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Pengaturan lanjutan"</string>
+    <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktifkan opsi pengaturan yang lain"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Info apl"</string>
     <string name="storage_label" msgid="8700867073480107253">"Penyimpanan"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Luncurkan secara bawaan"</string>
@@ -995,7 +981,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Hapus data"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Copot pemasangan pembaruan"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Anda telah memilih meluncurkan apl ini secara bawaan untuk beberapa tindakan."</string>
-    <string name="auto_launch_disable_text" msgid="7800385822185540166">"Tidak ada setelan bawaan."</string>
+    <string name="auto_launch_disable_text" msgid="7800385822185540166">"Tidak ada pengaturan bawaan."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Hapus bawaan"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Apl ini mungkin tidak didesain untuk layar Anda. Anda dapat mengontrol cara menyesuaikannya dengan layar di sini."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"Tanyakan saat diluncurkan"</string>
@@ -1020,7 +1006,7 @@
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Penyimpanan kartu SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Menghitung ulang ukuran..."</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"Hapus data apl?"</string>
-    <string name="clear_data_dlg_text" msgid="8847257251846779938">"Semua data apl ini akan dihapus secara permanen, termasuk semua berkas, setelan, akun, basis data, dll."</string>
+    <string name="clear_data_dlg_text" msgid="8847257251846779938">"Semua data apl ini akan dihapus secara permanen, termasuk semua file, pengaturan, akun, basis data, dll."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Batal"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -1079,11 +1065,11 @@
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"Layanan"</string>
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Proses"</string>
     <string name="service_stop" msgid="6369807553277527248">"Berhenti"</string>
-    <string name="service_manage" msgid="1876642087421959194">"Setelan"</string>
+    <string name="service_manage" msgid="1876642087421959194">"Pengaturan"</string>
     <string name="service_stop_description" msgid="9146619928198961643">"Layanan ini dimulai oleh aplikasinya. Menghentikan layanan dapat mengakibatkan gagalnya apl."</string>
     <string name="heavy_weight_stop_description" msgid="2979218727598321095">"Apl ini tidak dapat dihentikan dengan aman. Jika Anda menghentikannya, beberapa pekerjaan yang sedang dilakukan mungkin akan hilang."</string>
     <string name="background_process_stop_description" msgid="5034773197139654588">"Ini adalah proses apl lama yang masih berjalan seandainya dibutuhkan lagi. Biasanya tidak ada alasan untuk menghentikannya."</string>
-    <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: sedang digunakan. Sentuh Setelan untuk mengontrolnya."</string>
+    <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: sedang digunakan. Sentuh Pengaturan untuk mengontrolnya."</string>
     <string name="main_running_process_description" msgid="1130702347066340890">"Proses utama sedang digunakan."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Layanan <xliff:g id="COMP_NAME">%1$s</xliff:g> sedang digunakan."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Penyedia <xliff:g id="COMP_NAME">%1$s</xliff:g> sedang digunakan."</string>
@@ -1092,7 +1078,7 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Jika Anda menghentikan layanan ini, beberapa fitur ponsel mungkin tidak bekerja dengan semestinya sampai Anda mematikan dan menyalakannya lagi."</string>
     <string name="language_settings" msgid="5292716747264442359">"Bahasa &amp; masukan"</string>
     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Bahasa &amp; masukan"</string>
-    <string name="language_settings_category" msgid="2288258489940617043">"Setelan bahasa"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Pengaturan bahasa"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Keyboard &amp; metode masukan"</string>
     <string name="phone_language" msgid="8870144109924299673">"Bahasa"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1101,7 +1087,7 @@
     <string name="auto_caps" msgid="6379232078052591265">"Huruf besar otomatis"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Besarkan huruf pertama pada kalimat"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Beri tanda baca otomatis"</string>
-    <string name="hardkeyboard_category" msgid="5957168411305769899">"Setelan keyboard fisik"</string>
+    <string name="hardkeyboard_category" msgid="5957168411305769899">"Pengaturan keyboard fisik"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Tekan Spasi dua kali untuk memasukkan \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Perlihatkan sandi"</string>
     <string name="show_password_summary" msgid="7345931695292850058"></string>
@@ -1150,15 +1136,15 @@
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Selalu tampilkan"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Selalu sembunyikan"</string>
     <string name="configure_input_method" msgid="1317429869771850228">"Menyiapkan metode masukan"</string>
-    <string name="input_method_settings" msgid="5801295625486269553">"Setelan"</string>
-    <string name="input_method_settings_button" msgid="6778344383871619368">"Setelan"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Pengaturan"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Pengaturan"</string>
     <string name="active_input_method_subtypes" msgid="3596398805424733238">"Metode masukan aktif"</string>
     <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Gunakan bahasa sistem"</string>
-    <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> setelan"</string>
+    <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> pengaturan"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Pilih metode masukan aktif"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Setelan keyboard layar"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Pengaturan keyboard layar"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Keyboard fisik"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Setelan keyboard fisik"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Pengaturan keyboard fisik"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Opsi pengembang"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Menyetel opsi untuk pengembangan apl"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Debugging USB"</string>
@@ -1171,8 +1157,8 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Mengizinkan lokasi palsu"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Izinkan melakukan debug USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Debugging USB dimaksudkan untuk tujuan pengembangan saja. Gunakan untuk menyalin data antara komputer dan perangkat Anda, memasang apl pada perangkat tanpa pemberitahuan, dan membaca data log."</string>
-    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Izinkan setelan pengembangan?"</string>
-    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Setelan ini hanya dimaksudkan untuk penggunaan pengembangan. Setelan dapat menyebabkan perangkat dan aplikasi yang menerapkannya rusak atau tidak berfungsi semestinya."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Izinkan pengaturan pengembangan?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Pengaturan ini hanya dimaksudkan untuk penggunaan pengembangan. Pengaturan dapat menyebabkan perangkat dan aplikasi yang menerapkannya rusak atau tidak berfungsi semestinya."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pilih gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pilih widget"</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>
@@ -1186,7 +1172,7 @@
     <string name="launch_count_label" msgid="4019444833263957024">"Hitung"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Waktu penggunaan"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Aksesibilitas"</string>
-    <string name="accessibility_settings_title" msgid="2130492524656204459">"Setelan aksesibilitas"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Pengaturan aksesibilitas"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Layanan"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Teks besar"</string>
@@ -1196,7 +1182,7 @@
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Ketika Jelajahi dengan Sentuhan dinyalakan, Anda dapat mendengar atau melihat uraian dari apa yang ada di bawah jari Anda."\n\n" Fitur ini untuk pengguna dengan penglihatan yang tidak terlalu bagus."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Tundaan sentuh &amp; tahan"</string>
     <string name="accessibility_script_injection_title" msgid="3264723681038625967">"Pasang skrip web"</string>
-    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Setelan"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Pengaturan"</string>
     <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Tutorial"</string>
     <string name="accessibility_service_state_on" msgid="8791337599927106344">"Nyala"</string>
     <string name="accessibility_service_state_off" msgid="2458594460762620776">"Mati"</string>
@@ -1211,11 +1197,11 @@
     <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Menyentuh OK akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Tidak ada layanan terpasang"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Perlu pembaca layar?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack menyediakan umpan balik lisan untuk membantu pengguna yang buta dan tidak terlalu baik penglihatannya. Apakah Anda ingin memasangnya secara gratis dari Android Market?"</string>
+    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack menyediakan masukan lisan untuk membantu pengguna yang buta dan tidak terlalu baik penglihatannya. Apakah Anda ingin memasangnya secara gratis dari Android Market?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Apakah Anda ingin apl memasang skrip dari Google yang membuat konten webnya lebih mudah diakses?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="5474167409993309316">"Fitur ini mengubah cara perangkat Anda menanggapi sentuhan. Aktifkan?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tidak tersedia uraian."</string>
-    <string name="settings_button" msgid="3006713718908152930">"Setelan"</string>
+    <string name="settings_button" msgid="3006713718908152930">"Pengaturan"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterai"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Apa yang menggunakan daya baterai"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Data penggunaan baterai tidak tersedia."</string>
@@ -1263,10 +1249,10 @@
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Waktu tanpa sinyal"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Paksa berhenti"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Info apl"</string>
-    <string name="battery_action_app_settings" msgid="4570481408106287454">"Setelan apl"</string>
-    <string name="battery_action_display" msgid="7338551244519110831">"Setelan layar"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Setelan Wi-Fi"</string>
-    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Setelan bluetooth"</string>
+    <string name="battery_action_app_settings" msgid="4570481408106287454">"Pengaturan apl"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Pengaturan layar"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Pengaturan Wi-Fi"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Pengaturan bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Baterai digunakan oleh panggilan suara"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Baterai digunakan saat tablet menganggur"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Baterai digunakan ketika ponsel dalam keadaan menganggur"</string>
@@ -1282,7 +1268,7 @@
     <string name="battery_desc_apps" msgid="8530418792605735226">"Baterai digunakan oleh apl"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Hentikan atau copot pemasangan apl"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Mengontrol GPS secara manual untuk mencegah apl menggunakannya"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Apl tersebut mungkin menawarkan setelan untuk mengurangi penggunaan baterai"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Apl tersebut mungkin menawarkan pengaturan untuk mengurangi penggunaan baterai"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sejak dicabut"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ketika terakhir dicabut untuk <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total penggunaan"</string>
@@ -1290,18 +1276,18 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"OS Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Masukan suara &amp; keluaran"</string>
-    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Masukan suara &amp; setelan keluaran"</string>
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Masukan suara &amp; pengaturan keluaran"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Penelusuran suara"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Keyboard Android"</string>
     <string name="voice_category" msgid="1430370497125803904">"Ucapan"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Pengenalan suara"</string>
     <string name="recognizer_settings_title" msgid="432493301215113154">"Penelusuran Suara"</string>
-    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Setelan untuk \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Setelan text-to-speech"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Pengaturan untuk \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
+    <string name="tts_settings" msgid="8186971894801348327">"Pengaturan text-to-speech"</string>
     <string name="tts_settings_title" msgid="1237820681016639683">"Keluaran text-to-speech"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Selalu gunakan setelan saya"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Setelan bawaan di bawah menggantikan setelan apl"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Setelan bawaan"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Selalu gunakan pengaturan saya"</string>
+    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Pengaturan bawaan di bawah menggantikan pengaturan apl"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"Pengaturan bawaan"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Mesin bawaan"</string>
     <string name="tts_default_synth_summary" msgid="6482936537135251690">"Atur mesin sintesa suara untuk digunakan pada teks lisan"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Laju bicara"</string>
@@ -1315,17 +1301,17 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Pasang data suara"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Pasang data suara yang dibutuhkan untuk sintesa suara"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Suara yang diperlukan untuk sintesa suara sudah terpasang dengan baik"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Setelan Anda telah berubah. Ini adalah contoh bunyinya."</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Pengaturan Anda telah berubah. Ini adalah contoh bunyinya."</string>
     <string name="tts_engine_error" msgid="3305141107104670703">"Mesin yang Anda pilih tidak dapat dijalankan."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurasikan"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pilih mesin lain"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Mesin sintesa suara ini mungkin dapat mengumpulkan semua teks yang akan diucapkan, termasuk di antaranya data pribadi seperti sandi dan nomor kartu kredit. Berasal dari <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> aplikasi. Gunakan metode masukan ini?"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Mesin"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> setelan"</string>
+    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> pengaturan"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> diaktifkan"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> dinonaktifkan"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Setelan mesin"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Setelan untuk <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Pengaturan mesin"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Pengaturan untuk <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Bahasa dan suara"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Terpasang"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Tidak terpasang"</string>
@@ -1333,12 +1319,12 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Pria"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Mesin sintetis ucapan terpasang"</string>
     <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Aktifkan msin br sblm dgunakn."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Luncurkan setelan mesin"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Luncurkan pengaturan mesin"</string>
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Mesin yang dipilih"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Umum"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kontrol daya"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Memperbarui setelan Wi-Fi"</string>
-    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Memperbarui setelan Bluetooth"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Memperbarui pengaturan Wi-Fi"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Memperbarui pengaturan Bluetooth"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Penyimpanan kredensial"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Pasang dari penyimpanan"</string>
@@ -1368,17 +1354,17 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Mencadangkan &amp; memulihkan"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Data pribadi"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Mencadangkan dataku"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Mencadangkan data apl, sandi Wi-Fi, dan setelan lainnya ke server Google"</string>
+    <string name="backup_data_summary" msgid="9157861529438245957">"Mencadangkan data apl, sandi Wi-Fi, dan pengaturan lainnya ke server Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Akun cadangan"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Saat ini, tidak ada akun yang menyimpan data cadangan"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Pemulihan otomatis"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"Memulihkan cadangan setelan dan data ketika memasang ulang apl"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"Memulihkan cadangan pengaturan dan data ketika memasang ulang apl"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Sandi cadangan desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Saat ini cadangan desktop penuh tidak dilindungi"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Sentuh guna mengubah atau menghapus sandi untuk cadangan lengkap desktop"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Hentikan mencadangkan sandi Wi-Fi, bookmark, setelan lainnya, dan data apl, serta menghapus semua salinan di server Google?"</string>
-    <string name="device_admin_settings_title" msgid="1335557832906433309">"Setelan administrasi perangkat"</string>
+    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Hentikan mencadangkan sandi Wi-Fi, bookmark, pengaturan lainnya, dan data apl, serta menghapus semua salinan di server Google?"</string>
+    <string name="device_admin_settings_title" msgid="1335557832906433309">"Pengaturan administrasi perangkat"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator perangkat"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Nonaktifkan"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administrator perangkat"</string>
@@ -1418,13 +1404,13 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Menyambungkan..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Lanjutkan ke langkah berikutnya"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP tidak didukung."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Anda tidak dapat mengonfigurasi sambungan Wi-Fi EAP selama penyiapan. Setelah penyiapan, Anda dapat melakukannya di Setelan &gt; Nirkabel &amp; jaringan."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Anda tidak dapat mengonfigurasi sambungan Wi-Fi EAP selama penyiapan. Setelah penyiapan, Anda dapat melakukannya di Pengaturan &gt; Nirkabel &amp; jaringan."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Menyambungkan membutuhkan waktu beberapa menit..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Sentuh "<b>"Berikutnya"</b>" untuk melanjutkan penyiapan. "\n\n"Sentuh "<b>"Kembali"</b>" untuk menyambung dengan jaringan Wi-Fi yang berbeda."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronisasi diaktifkan"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinkronisasi dinonaktifkan"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Galat sinkronisasi."</string>
-    <string name="account_sync_settings_title" msgid="4578227872921044660">"Setelan sinkronisasi"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Pengaturan sinkronisasi"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Saat ini sinkronisasi mengalami masalah. Sinkronisasi akan segera berfungsi kembali."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Tambahkan akun"</string>
     <string name="background_data" msgid="5779592891375473817">"Data latar belakang"</string>
@@ -1435,8 +1421,8 @@
     <string name="sync_enabled" msgid="4551148952179416813">"Sinkronisasi AKTIF"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Sinkronisasi NONAKTIF:"</string>
     <string name="sync_error" msgid="5060969083117872149">"Galat sinkronisasi"</string>
-    <string name="settings_backup" msgid="2274732978260797031">"Setelan cadangan"</string>
-    <string name="settings_backup_summary" msgid="7916877705938054035">"Cadangkan setelan saya"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Pengaturan cadangan"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Cadangkan pengaturan saya"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinkronkan sekarang"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Batalkan sinkronisasi"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Sentuh untuk menyinkronkan sekarang<xliff:g id="LAST_SYNC_TIME">
@@ -1445,29 +1431,29 @@
     <string name="sync_calendar" msgid="9056527206714733735">"Kalender"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kenalan"</string>
     <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Selamat datang di Google sync!"</font>" "\n"Pendekatan Google untuk menyinkronkan data guna memungkinkan akses ke kenalan, janji temu, dan lain-lain dari mana saja."</string>
-    <string name="header_application_sync_settings" msgid="6205903695598000286">"Setelan sinkronisasi apl"</string>
+    <string name="header_application_sync_settings" msgid="6205903695598000286">"Pengaturan sinkronisasi apl"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data &amp; sinkronisasi"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Ubah sandi"</string>
-    <string name="header_account_settings" msgid="5382475087121880626">"Setelan akun"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Pengaturan akun"</string>
     <string name="remove_account_label" msgid="5921986026504804119">"Hapus akun"</string>
     <string name="header_add_an_account" msgid="756108499532023798">"Tambah akun"</string>
     <string name="finish_button_label" msgid="481587707657751116">"Selesai"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"Hapus akun?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Menghapus akun ini akan menghapus semua pesan, data kenalan, dan data lain akun tersebut dari tablet!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Menghapus akun ini akan menghapus semua pesan, data kenalan, dan data lainnya akun tersebut dari ponsel!"</string>
-    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Akun ini diperlukan oleh beberapa apl. Anda hanya dapat menghapusnya dengan menyetel ulang tablet ke bawaan pabrik (yang menghapus semua data pribadi Anda) di Setelan &gt; Cadangan &amp; setel ulang."</string>
-    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Akun ini diperlukan oleh beberapa apl. Anda hanya dapat menghapusnya dengan menyetel ulang ponsel ke bawaan pabrik (yang menghapus semua data pribadi Anda) dalam Setelan &gt; Cadangan &amp; setel ulang."</string>
+    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Akun ini diperlukan oleh beberapa apl. Anda hanya dapat menghapusnya dengan menyetel ulang tablet ke bawaan pabrik (yang menghapus semua data pribadi Anda) di Pengaturan &gt; Cadangan &amp; setel ulang."</string>
+    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Akun ini diperlukan oleh beberapa apl. Anda hanya dapat menghapusnya dengan menyetel ulang ponsel ke bawaan pabrik (yang menghapus semua data pribadi Anda) dalam Pengaturan &gt; Cadangan &amp; setel ulang."</string>
     <string name="provider_label" msgid="7724593781904508866">"Langganan push"</string>
     <string name="sync_item_title" msgid="1931551540462877488">"Sinkronisasikan <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Tidak dapat menyinkronkan secara manual"</string>
-    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Saat ini, sinkronisasi untuk item ini dinonaktifkan. Untuk mengubah setelan ini, aktifkan data latar belakang dan sinkronisasi otomatis untuk sementara."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Setelan 4G"</string>
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Saat ini, sinkronisasi untuk item ini dinonaktifkan. Untuk mengubah pengaturan ini, aktifkan data latar belakang dan sinkronisasi otomatis untuk sementara."</string>
+    <string name="wimax_settings" msgid="1574837328738396794">"Pengaturan 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Memulai &amp; mengelola jaringan 4G dan modem"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Alamat MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Ketik sandi untuk mendekripsi penyimpanan"</string>
     <string name="try_again" msgid="4272075051293936921">"Coba lagi."</string>
     <string name="delete" msgid="4219243412325163003">"Hapus"</string>
-    <string name="misc_files" msgid="6720680815969643497">"Berkas Serbaneka"</string>
+    <string name="misc_files" msgid="6720680815969643497">"File Serbaneka"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Terpilih <xliff:g id="NUMBER">%1$d</xliff:g> dari <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Pilih semua"</string>
@@ -1487,7 +1473,7 @@
     <string name="pointer_location" msgid="6084434787496938001">"Lokasi penunjuk"</string>
     <string name="pointer_location_summary" msgid="840819275172753713">"Hamparan layar menampilkan data sentuhan saat ini"</string>
     <string name="show_touches" msgid="1356420386500834339">"Tampilkan sentuhan"</string>
-    <string name="show_touches_summary" msgid="6684407913145150041">"Tampilkan umpan balik visual untuk sentuhan"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Tampilkan masukan visual untuk sentuhan"</string>
     <string name="show_screen_updates" msgid="8282711794220426931">"Tampilkan pembaruan layar"</string>
     <string name="show_screen_updates_summary" msgid="1716122382094924596">"Kedipkan area layar saat diperbarui"</string>
     <string name="disable_overlays" msgid="3645736086368449005">"Nonaktifkan hamparan"</string>
@@ -1534,12 +1520,12 @@
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"Data seluler"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"Data 2G-3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Data 4G"</string>
-    <string name="data_usage_app_settings" msgid="8430240158135453271">"Lihat setelan apl"</string>
+    <string name="data_usage_app_settings" msgid="8430240158135453271">"Lihat pengaturan apl"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Batasi data latar belakang"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Nonaktifkan data latar belakang pada jaringan data seluler saja. Wi-Fi akan digunakan jika tersedia."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Untuk membatasi data latar belakang pada apl ini, setel batas data seluler terlebih dulu."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Batasi data latar belakang?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Fitur ini dapat menyebabkan sebuah apl yang bergantung pada data latar belakang berhenti bekerja ketika Wi-Fi tidak tersedia."\n\n"Anda dapat menemukan kontrol penggunaan data yang tepat dalam setelan yang tersedia dalam apl."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Fitur ini dapat menyebabkan sebuah apl yang bergantung pada data latar belakang berhenti bekerja ketika Wi-Fi tidak tersedia."\n\n"Anda dapat menemukan kontrol penggunaan data yang tepat dalam pengaturan yang tersedia dalam apl."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Pembatasan data latar belakang hanya dimungkinkan bila Anda telah menyetel batas data seluler."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tanggal penyetelan ulang daur penggunaan"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Tanggal setiap bulannya:"</string>
@@ -1581,21 +1567,14 @@
     <string name="vpn_cancel" msgid="1979937976123659332">"Batal"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Simpan"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Sambungkan"</string>
-    <!-- no translation found for vpn_edit (8647191407179996943) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (5965299358485793260) -->
-    <skip />
+    <string name="vpn_edit" msgid="8647191407179996943">"Mengedit profil VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Menyambung ke <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <!-- no translation found for vpn_create (5628219087569761496) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (408275284159243490) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (8098021690546891414) -->
-    <skip />
-    <!-- no translation found for vpn_no_network (3050233675132726155) -->
-    <skip />
-    <!-- no translation found for vpn_missing_cert (7972907102570411501) -->
-    <skip />
+    <string name="vpn_create" msgid="5628219087569761496">"Menambahkan profil VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Edit profil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Hapus profil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Tidak ada sambungan jaringan. Coba lagi nanti."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Sertifikat hilang. Silakan edit profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Pengguna"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Nonaktifkan"</string>
@@ -1614,7 +1593,7 @@
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bagus. Tetap geser jari Anda pada layar sampai menemukan setidaknya satu ikon lagi."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Untuk mengaktifkan sesuatu yang Anda sentuh, ketuklah. Geser jari Anda sampai Anda menemukan ikon untuk <xliff:g id="APP_NAME">%s</xliff:g>. Kemudian ketuk ikon sekali untuk mengaktifkannya."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Jari Anda menyentuh ikon <xliff:g id="APP_NAME">%s</xliff:g>. Ketuk sekali untuk mengaktifkan ikon."</string>
-    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Jari Anda bergerak pada ikon <xliff:g id="APP_NAME">%s</xliff:g>, dan kemudian berpindah. Perlahan-lahan geser jari Anda pada layar sampai menemukan ikon Peramban lagi."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Jari Anda bergerak pada ikon <xliff:g id="APP_NAME">%s</xliff:g>, dan kemudian berpindah. Perlahan-lahan geser jari Anda pada layar sampai menemukan ikon Browser lagi."</string>
     <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Bagus. Untuk melanjutkan ke pelajaran berikutnya, temukan dan aktifkan tombol <xliff:g id="NEXT">%s</xliff:g> yang terletak di dekat pojok kanan atas layar."</string>
     <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Pelajaran 2: Menggulir dengan dua jari"</string>
     <string name="accessibility_tutorial_lesson_2_text_1" msgid="8764686624055084454">"Untuk menggulir daftar, Anda dapat menggeser dua jari di sepanjang layar. Misalnya, layar aktif saat ini berisi daftar nama apl yang dapat digulir ke atas atau ke bawah. Pertama, coba identifikasi beberapa item dalam daftar dengan menggeser satu jari."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 30cc47f..8ba7068 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Si è verificato un problema durante la modifica dell\'impostazione"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Aggiungi rete"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Reti Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Pulsante di comando WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Inserimento PIN WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scansione"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanzate"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connetti alla rete"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifica rete"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Per conoscere le reti disponibili, attiva il Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostra opzioni avanzate"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Impostazione protetta Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Avvvio WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Premi il pulsante WPS sul router Wi-Fi. Il completamento dell\'installazione può richiedere fino a due minuti."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Inserisci il pin <xliff:g id="PIN">%1$s</xliff:g> sul router Wi-Fi. Il completamento dell\'installazione può richiedere fino a due minuti."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Configurazione WPS riuscita. Connessione alla rete..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Connesso alla rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"La configurazione WPS è già in corso e il completamento può richiedere fino a due minuti"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Configurazione WPS non riuscita. Riprova tra qualche minuto."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"L\'impostazione di sicurezza del router wireless (WEP) non è supportata"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"L\'impostazione di sicurezza del router wireless (TKIP) non è supportata"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Errore di autenticazione. Riprova."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"È stata rilevata un\'altra sessione WPS. Riprova tra qualche minuto."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID rete"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sicurezza"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensità segnale"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index d8068e7..c975bd1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"אירעה בעיה בשינוי ההגדרה"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"הוסף רשת"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"רשתות Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"לחצן WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"הזנת PIN ‏של WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"סרוק"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"מתקדם"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"התחבר לרשת"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"שנה רשת"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"כדי לראות רשתות זמינות, הפעל את ה-Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"הצג אפשרויות מתקדמות"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"התקנה מוגנת של Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"מפעיל WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"לחץ על לחצן ה-WPS בנתב ה-Wi-Fi שלך. ההתקנה יכולה להימשך עד שתי דקות."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"הזן את ה-pin ‏<xliff:g id="PIN">%1$s</xliff:g> בנתב ה-Wi-Fi שלך. ההתקנה יכולה להימשך עד שתי דקות."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS הצליח. מתחבר לרשת..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"מחובר לרשת Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS כבר מתבצע, והפעולה יכולה להימשך עד שתי דקות"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS נכשל. נסה שוב בעוד מספר דקות."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"הגדרת האבטחה של הנתב האלחוטי (WEP) אינה נתמכת"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"הגדרת האבטחה של הנתב האלחוטי (TKIP) אינה נתמכת"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"האימות נכשל. נסה שוב."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"אותרה פעילות WPS נוספת באתר. נסה שוב בעוד מספר דקות."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"של הרשת SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"אבטחה"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"עוצמת אות"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 1070d46..33a4e72 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -79,10 +79,34 @@
     <item msgid="4907380534957572531">"高い"</item>
     <item msgid="4699640516390840297">"非常に高い"</item>
   </string-array>
-    <!-- no translation found for wifi_status:10 (6367044185730295334) -->
-    <!-- no translation found for wifi_status:11 (503942654197908005) -->
-    <!-- no translation found for wifi_status_with_ssid:10 (5660739516542454527) -->
-    <!-- no translation found for wifi_status_with_ssid:11 (1805837518286731242) -->
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"スキャン中..."</item>
+    <item msgid="8513729475867537913">"接続中..."</item>
+    <item msgid="515055375277271756">"認証中..."</item>
+    <item msgid="1943354004029184381">"IPアドレスを取得中..."</item>
+    <item msgid="4221763391123233270">"接続済み"</item>
+    <item msgid="624838831631122137">"保留中"</item>
+    <item msgid="7979680559596111948">"切断中..."</item>
+    <item msgid="1634960474403853625">"切断されました"</item>
+    <item msgid="746097431216080650">"失敗しました"</item>
+    <item msgid="6367044185730295334">"ブロック中"</item>
+    <item msgid="503942654197908005">"接続不良により一時的に無効"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"スキャン中..."</item>
+    <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>に接続中..."</item>
+    <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>による認証中..."</item>
+    <item msgid="7928343808033020343">"IPアドレスを<xliff:g id="NETWORK_NAME">%1$s</xliff:g>から取得中..."</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>に接続しました"</item>
+    <item msgid="1330262655415760617">"保留中"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>から切断中..."</item>
+    <item msgid="197508606402264311">"切断されました"</item>
+    <item msgid="8578370891960825148">"失敗しました"</item>
+    <item msgid="5660739516542454527">"ブロック中"</item>
+    <item msgid="1805837518286731242">"接続不良により一時的に無効"</item>
+  </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
     <!-- no translation found for wifi_security:2 (1532568756571457140) -->
@@ -90,7 +114,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_eap_method:3 (435667726254379514) -->
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"PEAP"</item>
+    <item msgid="7981731051382306293">"TLS"</item>
+    <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ボタンを押す"</item>
     <item msgid="1624323946324499595">"ピアデバイスのPIN"</item>
@@ -135,7 +164,12 @@
     <item msgid="3703676222230317933">"起動回数"</item>
     <item msgid="2502754479975776899">"アプリ名"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:3 (2318274046749286642) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"なし"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 95153cb..d9c9c82 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -571,14 +571,11 @@
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"、<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>で保護"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"なし"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"接続"</string>
-    <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
-    <skip />
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ネットワークに接続できませんでした"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"切断"</string>
-    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
-    <skip />
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ネットワークから切断できませんでした"</string>
     <string name="wifi_save" msgid="3331121567988522826">"保存"</string>
-    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
-    <skip />
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"ネットワークを保存できませんでした"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"キャンセル"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"高度なWi-Fi設定"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi周波数帯域"</string>
@@ -1586,21 +1583,14 @@
     <string name="vpn_cancel" msgid="1979937976123659332">"キャンセル"</string>
     <string name="vpn_save" msgid="4233484051644764510">"保存"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"接続"</string>
-    <!-- no translation found for vpn_edit (8647191407179996943) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (5965299358485793260) -->
-    <skip />
+    <string name="vpn_edit" msgid="8647191407179996943">"VPNプロフィールの編集"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g>に接続"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <!-- no translation found for vpn_create (5628219087569761496) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (408275284159243490) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (8098021690546891414) -->
-    <skip />
-    <!-- no translation found for vpn_no_network (3050233675132726155) -->
-    <skip />
-    <!-- no translation found for vpn_missing_cert (7972907102570411501) -->
-    <skip />
+    <string name="vpn_create" msgid="5628219087569761496">"VPNプロフィールの追加"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"プロフィールを編集"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"プロフィールを削除"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"ネットワークに接続できません。しばらくしてからもう一度お試しください。"</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"証明書がありません。プロフィールを編集してください。"</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"システム"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"ユーザー"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"無効にする"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 1dc10dc..8c82d5f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"설정을 변경하는 중 문제가 발생했습니다."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"네트워크 추가"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 네트워크"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS 누르기 버튼"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN 입력"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"검색"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"고급"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"네트워크 연결"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"네트워크 수정"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"사용 가능한 네트워크를 보려면 Wi-Fi를 켭니다."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"고급 옵션 표시"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"WPS(Wi-Fi 간편 설정)"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS을 시작하는 중…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Wi-Fi 공유기에서 WPS 버튼을 누르세요. 설정을 완료하는 데 최대 2분이 소요됩니다."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Wi-Fi 공유기에 개인 식별 번호 <xliff:g id="PIN">%1$s</xliff:g>을(를) 입력하세요. 설정을 완료하는 데 최대 2분이 소요됩니다."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS 성공. 네트워크에 연결 중…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Wi-Fi 네트워크 <xliff:g id="NETWORK_NAME">%s</xliff:g>에 연결됨"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS를 이미 처리하고 있으며 완료하는 데 최대 2분이 소요됩니다."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS 실패. 잠시 후 다시 시도해 주세요."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"무선 공유기 보안 설정(WEP)은 지원되지 않습니다."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"무선 공유기 보안 설정(TKIP)은 지원되지 않습니다."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"인증하지 못했습니다. 다시 시도하세요."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"다른 WPS 세션이 감지되었습니다. 잠시 후 다시 시도해 주세요."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"네트워크 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"보안"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"신호 강도"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 6e0dfae..1cd5412 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Keičiant nustatymą kilo problemų"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Pridėti tinklą"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"„Wi-Fi“ tinklai"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS paspaudimo mygt."</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN kodo įrašas"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Nuskaityti"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Išplėstinis"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Prijungti prie tinklo"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Keisti tinklą"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Jei norite peržiūrėti pasiekiamus tinklus, įjunkite „Wi-Fi“."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Rodyti išplėstines parinktis"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Apsaugota „Wi-Fi“ sąranka"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Pradedama WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Paspauskite WPS mygtuką ant „Wi-Fi“ maršruto parinktuvo. Sąranka gali trukti iki dviejų min."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Įveskite „Wi-Fi“ maršruto parinktuvo <xliff:g id="PIN">%1$s</xliff:g> kodą. Sąranka gali trukti iki dviejų min."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS pavyko. Prisijungiama prie tinklo…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Prisijungta prie „Wi-Fi“ tinklo „<xliff:g id="NETWORK_NAME">%s</xliff:g>“"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS jau vykdoma ir gali užtrukti iki dviejų min., kol bus baigta"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS neįvykdyta. Po kelių minučių bandykite dar kartą."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Belaidžio maršruto parinktuvo saugos nustatymas (WEP) nepalaikomas"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Belaidžio maršruto parinktuvo saugos nustatymas (TKIP) nepalaikomas"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Nepavyko autentifikuoti. Bandykite dar kartą."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Aptikta kita WPS sesija. Po kelių minučių bandykite dar kartą."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Tinklo SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sauga"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signalo stiprumas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index f18efbe..f83f3a6 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Mainot iestatījumu, radās kļūda"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Pievienot tīklu"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi tīkli"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS spiedpoga"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN ievade"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skenēt"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Papildu"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Izveidot savienojumu ar tīklu"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Pārveidot tīklu"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Lai skatītu pieejamos tīklus, ieslēdziet Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Rādīt papildopcijas"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi aizsargātā iestatīšana"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Notiek WPS sākšana..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Nospiediet WPS spiedpogu uz Wi-Fi maršrutētāja. Iestatīšana var ilgt divas minūtes."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Ievadiet uz Wi-Fi maršrutētāja norādīto <xliff:g id="PIN">%1$s</xliff:g>. Iestatīšana var ilgt divas minūtes."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS bija veiksmīga. Notiek savienojuma izveide ar tīklu..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Ir izveidots savienojums ar Wi-Fi tīklu <xliff:g id="NETWORK_NAME">%s</xliff:g>."</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS jau notiek, un tās pabeigšana var ilgt divas minūtes."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS neizdevās. Lūdzu, pēc dažām minūtēm mēģiniet vēlreiz."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Bezvadu maršrutētāja drošības iestatījums (WEP) netiek atbalstīts."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Bezvadu maršrutētāja drošības iestatījums (TKIP) netiek atbalstīts."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentificēšana neizdevās. Lūdzu, mēģiniet vēlreiz."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Tika noteikta cita WPS sesija. Lūdzu, pēc dažām minūtēm mēģiniet vēlreiz."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Tīkla SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Drošība"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signāla stiprums"</string>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index d7feca8..a1bc65c 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -79,10 +79,34 @@
     <item msgid="4907380534957572531">"Tinggi"</item>
     <item msgid="4699640516390840297">"Sangat tinggi"</item>
   </string-array>
-    <!-- no translation found for wifi_status:10 (6367044185730295334) -->
-    <!-- no translation found for wifi_status:11 (503942654197908005) -->
-    <!-- no translation found for wifi_status_with_ssid:10 (5660739516542454527) -->
-    <!-- no translation found for wifi_status_with_ssid:11 (1805837518286731242) -->
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Mengimbas..."</item>
+    <item msgid="8513729475867537913">"Menyambung..."</item>
+    <item msgid="515055375277271756">"Mengesahkan..."</item>
+    <item msgid="1943354004029184381">"Mendapatkan alamat IP..."</item>
+    <item msgid="4221763391123233270">"Disambungkan"</item>
+    <item msgid="624838831631122137">"Digantung"</item>
+    <item msgid="7979680559596111948">"Memutuskan sambungan..."</item>
+    <item msgid="1634960474403853625">"Diputuskan sambungan"</item>
+    <item msgid="746097431216080650">"Tidak berjaya"</item>
+    <item msgid="6367044185730295334">"Disekat"</item>
+    <item msgid="503942654197908005">"Mengelakkan sambungan lemah buat sementara"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Mengimbas..."</item>
+    <item msgid="355508996603873860">"Menyambung kepada <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"Mengesahkan dengan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"Mendapatkan alamat IP dari <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="8937994881315223448">"Disambungkan kepada <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Digantung"</item>
+    <item msgid="7698638434317271902">"Memutuskan sambungan dari <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"Diputuskan sambungan"</item>
+    <item msgid="8578370891960825148">"Tidak berjaya"</item>
+    <item msgid="5660739516542454527">"Disekat"</item>
+    <item msgid="1805837518286731242">"Mengelakkan sambungan lemah buat sementara"</item>
+  </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
     <!-- no translation found for wifi_security:2 (1532568756571457140) -->
@@ -90,7 +114,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_eap_method:3 (435667726254379514) -->
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"PEAP"</item>
+    <item msgid="7981731051382306293">"TLS"</item>
+    <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Butang tekan"</item>
     <item msgid="1624323946324499595">"PIN daripada peranti rakan"</item>
@@ -135,7 +164,12 @@
     <item msgid="3703676222230317933">"Lancarkan kiraan"</item>
     <item msgid="2502754479975776899">"Nama aplikasi"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:3 (2318274046749286642) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Tiada"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 086564c..e8570a1 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -569,14 +569,11 @@
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", dijamin dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Tiada"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Sambung"</string>
-    <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
-    <skip />
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Gagal menyambung ke rangkaian."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
-    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
-    <skip />
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Gagal melupakan rangkaian"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Simpan"</string>
-    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
-    <skip />
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Gagal menyimpan rangkaian"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Batal"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi Lanjutan"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Jalur frekuensi Wi-Fi"</string>
@@ -1584,21 +1581,14 @@
     <string name="vpn_cancel" msgid="1979937976123659332">"Batal"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Simpan"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Sambung"</string>
-    <!-- no translation found for vpn_edit (8647191407179996943) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (5965299358485793260) -->
-    <skip />
+    <string name="vpn_edit" msgid="8647191407179996943">"Edit profil VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Sambung ke <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <!-- no translation found for vpn_create (5628219087569761496) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (408275284159243490) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (8098021690546891414) -->
-    <skip />
-    <!-- no translation found for vpn_no_network (3050233675132726155) -->
-    <skip />
-    <!-- no translation found for vpn_missing_cert (7972907102570411501) -->
-    <skip />
+    <string name="vpn_create" msgid="5628219087569761496">"Tambah profil VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Edit profil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Padam profil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Tiada sambungan rangkaian. Sila cuba sebentar lagi."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Ada sijil yang hilang. Sila edit profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Pengguna"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Lumpuhkan"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d10312f..f4546f5 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Det oppstod et problem under endring av innstillingen"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Legg til nettverk"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Trådløse nettverk"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Knapp for auto. WPS-lev."</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Skriv inn WPS-kode"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skann"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avansert"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Koble til nettverket"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Endre nettverk"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Hvis du vil se tilgj. nettverk, slår du på Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Vis avanserte alternativer"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi-beskyttet konfigurasjon"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starter WPS …"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Trykk på WPS-knappen på den trådløse ruteren din. Det kan kan opptil to minutter å fullføre konfigurasjonen."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Angi pin-koden <xliff:g id="PIN">%1$s</xliff:g> på Wi-Fi-ruteren din. Konfigurasjonen kan ta opptil to minutter å fullføre."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS var vellykket. Kobler til nettverket …"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Koblet til Wi-Fi-nettverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS har allerede startet, og det kan ta opptil to minutter før den fullføres"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS mislyktes. Prøv igjen om noen minutter."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Sikkerhetsinnstillingen (WEP) for trådløse rutere støttes ikke"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sikkerhetsinnstillingen (TKIP) for trådløse rutere støttes ikke"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentiseringsfeil. Prøv på nytt."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"En annen WPS-økt ble oppdaget. Prøv på nytt om noen minutter."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID for nettverket"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sikkerhet"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signalstyrke"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5872700..12e5e89 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Er is een probleem opgetreden bij het wijzigen van de instelling"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Netwerk toevoegen"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netwerken"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-knop"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-pin"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scannen"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Geavanceerd"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Verbinding maken met netwerk"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Netwerk aanpassen"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Schakel Wi-Fi in om beschikbare netwerken te bekijken."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Geavanceerde opties weergeven"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Beveiligde configuratie voor wifi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS starten…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Druk op de WPS-knop op uw wifi-router. De configuratie kan twee minuten duren."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Geef de pincode <xliff:g id="PIN">%1$s</xliff:g> op uw wifi-router op. De configuratie kan twee minuten in beslag nemen."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS geslaagd. Bezig met verbinding maken met netwerk…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Verbonden met wifi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS wordt al uitgevoerd; het kan twee minuten duren voordat dit proces is voltooid"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS is mislukt. Probeer het over enkele minuten opnieuw."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"De beveiligingsinstelling voor de draadloze router (WEP) wordt niet ondersteund"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"De beveiligingsinstelling voor de draadloze router (TKIP) wordt niet ondersteund"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authenticatie is mislukt. Probeer het opnieuw."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Er is een andere WPS-sessie gedetecteerd. Probeer het over een paar minuten opnieuw."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID van netwerk"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Beveiliging"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signaalsterkte"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 1543d3c..c384c06 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -114,7 +114,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_eap_method:3 (435667726254379514) -->
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"PEAP"</item>
+    <item msgid="7981731051382306293">"TLS"</item>
+    <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Naciśnij przycisk"</item>
     <item msgid="1624323946324499595">"Kod PIN z drugiego urządzenia"</item>
@@ -159,7 +164,12 @@
     <item msgid="3703676222230317933">"Licznik uruchomień"</item>
     <item msgid="2502754479975776899">"Nazwa aplikacji"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:3 (2318274046749286642) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Brak"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6f2c236..9abd10e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Wystąpił problem ze zmianą ustawienia"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj sieć"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Sieci Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Przycisk WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Wpisz PIN WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skanuj"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Zaawansowane"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Połącz z siecią"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modyfikuj sieć"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Aby zobaczyć dostępne sieci, włącz obsługę Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Pokaż opcje zaawansowane"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Konfiguracja zabezpieczonej sieci Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Uruchamianie WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Naciśnij przycisk WPS na routerze Wi-Fi. Konfiguracja może potrwać nawet dwie minuty."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Wpisz <xliff:g id="PIN">%1$s</xliff:g> na routerze Wi-Fi. Konfiguracja może potrwać nawet dwie minuty."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Konfiguracja WPS powiodła się. Łączenie z siecią..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Połączono z siecią Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Konfigurowanie WPS już trwa i może potrwać nawet dwie minuty"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Konfiguracja WPS nie powiodła się. Spróbuj ponownie za kilka minut."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Ustawienie zabezpieczeń routera bezprzewodowego (WEP) nie jest obsługiwane"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Ustawienie zabezpieczeń routera bezprzewodowego (TKIP) nie jest obsługiwane"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Błąd uwierzytelniania. Spróbuj ponownie."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Wykryto inną sesję WPS. Spróbuj ponownie za kilka minut."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Identyfikator SSID sieci"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpieczenia"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Siła sygnału"</string>
@@ -569,14 +555,11 @@
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Brak"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Połącz"</string>
-    <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
-    <skip />
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nie można nawiązać połączenia z siecią"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zapomnij"</string>
-    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
-    <skip />
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nie udało się zapomnieć sieci"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Zapisz"</string>
-    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
-    <skip />
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nie udało się zapisać sieci"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Anuluj"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Zaawansowane ustawienia Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Pasmo częstotliwości sieci Wi-Fi"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 87400d1..af9cd0f 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ocorreu um problema ao alterar a definição"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Adicionar rede"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botão WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Introdução PIN WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Procurar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançadas"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Ligar a uma rede"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar rede"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Para ver as redes disponíveis, ligue o Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar opções avançadas"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuração Wi-Fi Protegida"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"A iniciar WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Prima o botão WPS do router Wi-Fi. A configuração pode demorar até dois minutos a ser concluída."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Introduza o <xliff:g id="PIN">%1$s</xliff:g> do router Wi-Fi. A configuração pode demorar até dois minutos a ser concluída."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS iniciado com êxito. A estabelecer a ligação à rede..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Ligado à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"O WPS já está em curso e pode demorar até dois minutos a ser concluído"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"O WPS falhou. Tente novamente dentro de alguns minutos."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"A definição de segurança do router sem fios (WEP) não é suportada"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"A definição de segurança do router sem fios (TKIP) não é suportada"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Falha na autenticação. Tente novamente."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Foi detetada outra sessão do WPS. Tente novamente dentro de alguns minutos."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID da rede"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segurança"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensidade do sinal"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b45cce6..c9aac61 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ocorreu um problema com a mudança de configuração"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Adicionar rede"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botão de pressão WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Entrada de PIN WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Verificar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançado"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar-se à rede"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar rede"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Para ver as redes disponíveis, ative o Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar opções avançadas"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuração protegida do Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Pressione o botão WPS em seu roteador Wi-Fi. A configuração pode levar até dois minutos para ser concluída."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Insira o pin <xliff:g id="PIN">%1$s</xliff:g> em seu roteador Wi-Fi. A configuração pode levar até dois minutos para ser concluída."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS realizada. Conectando-se à rede…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Conectado à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"A WPS já está em andamento e pode levar até dois minutos para ser concluída"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Falha na WPS. Tente novamente em alguns minutos."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"A configuração de segurança do roteador sem fio (WEP) não é suportada"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"A configuração de segurança do roteador sem fio (TKIP) não é suportada"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Falha na autenticação. Tente novamente."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Outra sessão WPS foi detectada. Tente novamente em alguns minutos."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID da rede"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segurança"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Potência do sinal"</string>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 8a1c2ba..e1eac06 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -79,10 +79,34 @@
     <item msgid="4907380534957572531">"Ridicată"</item>
     <item msgid="4699640516390840297">"Foarte ridicat"</item>
   </string-array>
-    <!-- no translation found for wifi_status:10 (6367044185730295334) -->
-    <!-- no translation found for wifi_status:11 (503942654197908005) -->
-    <!-- no translation found for wifi_status_with_ssid:10 (5660739516542454527) -->
-    <!-- no translation found for wifi_status_with_ssid:11 (1805837518286731242) -->
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"În curs de scanare..."</item>
+    <item msgid="8513729475867537913">"Se conectează..."</item>
+    <item msgid="515055375277271756">"În curs de autentificare…"</item>
+    <item msgid="1943354004029184381">"Se obţine adresa IP..."</item>
+    <item msgid="4221763391123233270">"Conectată"</item>
+    <item msgid="624838831631122137">"Suspendată"</item>
+    <item msgid="7979680559596111948">"În curs de deconectare..."</item>
+    <item msgid="1634960474403853625">"Deconectată"</item>
+    <item msgid="746097431216080650">"Nereuşit"</item>
+    <item msgid="6367044185730295334">"Blocat"</item>
+    <item msgid="503942654197908005">"Evitarea temporară a conexiunii slabe"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"În curs de scanare..."</item>
+    <item msgid="355508996603873860">"Se conectează la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"Se autentifică cu <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Se obţine adresa IP de la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Conectat la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Suspendată"</item>
+    <item msgid="7698638434317271902">"În curs de deconectare de la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"Deconectată"</item>
+    <item msgid="8578370891960825148">"Nereuşit"</item>
+    <item msgid="5660739516542454527">"Blocat"</item>
+    <item msgid="1805837518286731242">"Evitarea temporară a conexiunii slabe"</item>
+  </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
     <!-- no translation found for wifi_security:2 (1532568756571457140) -->
@@ -90,7 +114,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_eap_method:3 (435667726254379514) -->
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"PEAP"</item>
+    <item msgid="7981731051382306293">"TLS"</item>
+    <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Buton WPS"</item>
     <item msgid="1624323946324499595">"Codul PIN de la disp. pereche"</item>
@@ -135,7 +164,12 @@
     <item msgid="3703676222230317933">"Numărul lansărilor"</item>
     <item msgid="2502754479975776899">"Numele aplicaţiei"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:3 (2318274046749286642) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Niciunul"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 002cae4..1ee932e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -569,14 +569,11 @@
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", securizată cu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Niciuna"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectaţi-vă"</string>
-    <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
-    <skip />
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nu s-a putut stabili conexiunea la reţea"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Eliminaţi"</string>
-    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
-    <skip />
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nu s-a putut elimina reţeaua"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salvaţi"</string>
-    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
-    <skip />
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nu s-a putut salva reţeaua"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Anulaţi"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Setări Wi-Fi avansate"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Bandă de frecvenţă Wi-Fi"</string>
@@ -1584,21 +1581,14 @@
     <string name="vpn_cancel" msgid="1979937976123659332">"Anulaţi"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Salvaţi"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Conectaţi"</string>
-    <!-- no translation found for vpn_edit (8647191407179996943) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (5965299358485793260) -->
-    <skip />
+    <string name="vpn_edit" msgid="8647191407179996943">"Editaţi profilul VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Conectaţi-vă la <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <!-- no translation found for vpn_create (5628219087569761496) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (408275284159243490) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (8098021690546891414) -->
-    <skip />
-    <!-- no translation found for vpn_no_network (3050233675132726155) -->
-    <skip />
-    <!-- no translation found for vpn_missing_cert (7972907102570411501) -->
-    <skip />
+    <string name="vpn_create" msgid="5628219087569761496">"Adăugaţi un profil VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Editaţi profilul"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Ştergeţi profilul"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Nu există nicio conexiune la reţea. Încercaţi din nou mai târziu."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Lipseşte un certificat. Editaţi profilul."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Utilizator"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Dezactivaţi"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 2cc4c89..c5ca938 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -114,7 +114,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_eap_method:3 (435667726254379514) -->
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"PEAP"</item>
+    <item msgid="7981731051382306293">"TLS"</item>
+    <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push-кнопка"</item>
     <item msgid="1624323946324499595">"PIN-код с обнаруженного устройства"</item>
@@ -159,7 +164,12 @@
     <item msgid="3703676222230317933">"Подсчитать"</item>
     <item msgid="2502754479975776899">"Название приложения"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:3 (2318274046749286642) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Нет"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0f34612..41bd58c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Не удалось изменить этот параметр"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Добавить сеть"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Сети Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Кнопка WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Вход по PIN-коду WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Поиск"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Дополнительные функции"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Подключиться к сети"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Изменить сеть"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Чтобы просмотреть доступные сети, включите Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Дополнительно"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Безопасная настройка Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Запуск WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Нажмите кнопку WPS на маршрутизаторе Wi-Fi. Для завершения настройки потребуется не более двух минут."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Введите код <xliff:g id="PIN">%1$s</xliff:g> на маршрутизаторе Wi-Fi. Для завершения настройки потребуется не более двух минут."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Ошибок нет. Подключение к сети…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Установлено подключение к сети Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Выполняется настройка WPS. На завершение этого процесса потребуется не более двух минут."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Ошибка. Повторите попытку через несколько минут."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Безопасная настройка беспроводного маршрутизатора (WEP) не поддерживается"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Безопасная настройка беспроводного маршрутизатора (TKIP) не поддерживаются"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Ошибка аутентификации. Повторите попытку."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Обнаружен другой сеанс WPS. Повторите попытку через несколько минут."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Имя сети (SSID)"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Безопасность"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Уровень сигнала"</string>
@@ -569,14 +555,11 @@
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", защита <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Нет"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Подключить"</string>
-    <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
-    <skip />
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Не удалось подключиться к сети."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Не подключаться"</string>
-    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
-    <skip />
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Не удалось удалить сеть."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Сохранить"</string>
-    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
-    <skip />
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Не удалось сохранить сеть."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Отмена"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Дополнительные функции"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Полоса частот Wi-Fi"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 91ffa60..53929bb 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -114,7 +114,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_eap_method:3 (435667726254379514) -->
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"PEAP"</item>
+    <item msgid="7981731051382306293">"TLS"</item>
+    <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Stlačenie tlačidla"</item>
     <item msgid="1624323946324499595">"Kód PIN zo zdieľaného zariad."</item>
@@ -159,7 +164,12 @@
     <item msgid="3703676222230317933">"Počet spustení"</item>
     <item msgid="2502754479975776899">"Názov aplikácie"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:3 (2318274046749286642) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Žiadne"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 505dde3..6d4e53a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Pri zmene nastavení sa vyskytol problém"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Pridať sieť"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Siete Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tlačidlo WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Zadanie kódu WPS PIN"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Vyhľadávanie"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Rozšírené"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Pripojiť k sieti"</string>
@@ -515,30 +513,19 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upraviť sieť"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Ak chcete zobraziť dostupné siete, zapnite sieť Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Zobraziť rozšírené možnosti"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Zabezpečené nastavenie siete Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Spúšťanie WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Stlačte tlačidlo WPS na vašom smerovači siete Wi-Fi. Proces nastavenia môže trvať až dve minúty."</string>
     <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
     <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Spustenie WPS sa podarilo. Prebieha pripájanie k sieti…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Pripojené k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS prebieha a dokončenie procesu môže trvať až dve mnúty."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Spustenie WPS zlyhalo. Skúste to znova o niekoľko minút."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Nastavenie zabezpečenia bezdrôtového smerovača (TKIP) nie je podporované"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Nastavenie zabezpečenia bezdrôtového smerovača (TKIP) nie je podporované"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Zlyhanie overenia totožnosti. Skúste to znova."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Bola rozpoznaná ďalšia relácia WPS. Skúste to znova o niekoľko minút."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Identifikátor SSID siete"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpečenie"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Sila signálu"</string>
@@ -569,14 +556,11 @@
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpečenie: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Žiadne"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Pripojiť"</string>
-    <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
-    <skip />
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nepodarilo sa pripojiť k sieti"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstrániť"</string>
-    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
-    <skip />
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nepodarilo sa odstrániť záznam siete"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Uložiť"</string>
-    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
-    <skip />
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nepodarilo sa uložiť sieť"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Zrušiť"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Rozšírené nastavenia Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Frekvenčné pásmo Wi-Fi"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 14217da..8137f56 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Težava pri spreminjanju nastavitve"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj omrežje"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Brezžična omrežja"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Gumb za WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Vnos kode PIN za WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Išči"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Dodatno"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Vzpostavi povezavo z omrežjem"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Spremeni omrežje"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Če si želite ogledati razpoložljiva omrežja, vklopite Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Prikaz dodatnih možnosti"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Zaščitena nastavitev Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Zagon nastavitve WPS ..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Na usmerjevalniku Wi-Fi pritisnite gumb WPS. Nastavitev lahko traja do dve minuti."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Vnesite osebno kodo <xliff:g id="PIN">%1$s</xliff:g> za usmerjevalnik Wi-Fi. Nastavitev lahko traja do dve minuti."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Nastavitev WPS je uspela. Povezovanje z omrežjem ..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Povezava z omrežjem Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> je vzpostavljena"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Nastavitev WPS že poteka in lahko traja do dve minuti"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Nastavitev WPS ni uspela. Poskusite znova čez nekaj minut."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Varnostna nastavitev brezžičnega usmerjevalnika (WEP) ni podprta"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Varnostna nastavitev brezžičnega usmerjevalnika (TKIP) ni podprta"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Preverjanje pristnosti ni uspelo. Poskusite znova."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Zaznana je druga seja WPS. Poskusite znova čez nekaj minut."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Omrežni SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Varnost"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Moč signala"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e28352b..2d4c3f8 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Дошло је до проблема приликом промене подешавања"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Додај мрежу"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi мреже"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS дугме"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Унос WPS PIN-а"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Скенирај"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Напредно"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Повежи са мрежом"</string>
@@ -515,30 +513,19 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Измени мрежу"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Да бисте видели доступне мреже, укључите Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Прикажи напредне опције"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Заштићено подешавање Wi-Fi-ја"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Покретање WPS-а..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Притисните WPS дугме на Wi-Fi рутеру. Подешавање ће бити довршено за највише два минута."</string>
     <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
     <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS је успео. Повезивање на мрежу..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Повезано са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS је већ покренут и биће довршен за највише два минута"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS није успео. Покушајте поново за неколико минута."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Безбедносно подешавање бежичног рутера (WEP) није подржано"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Безбедносно подешавање бежичног рутера (TKIP) није подржано"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Потврда аутентичности није успела. Покушајте поново."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Откривена је друга WPS сесија. Покушајте поново за неколико минута."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Мрежни SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Безбедност"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Јачина сигнала"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 02c54e4..d897796 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ett problem inträffade när inställningen ändrades"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Lägg till nätverk"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-nätverk"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-tryckknapp"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skanna"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avancerad"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Anslut till nätverk"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ändra nätverk"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Aktivera Wi-Fi för att visa tillgängliga nätverk."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Visa avancerade alternativ"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Skyddad Wi-Fi-konfiguration"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Startar WPS ..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Tryck på WPS-knappen på din Wi-Fi-router. Installationen kan ta upp till två minuter att slutföra."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Ange pinkoden <xliff:g id="PIN">%1$s</xliff:g> på din Wi-Fi-router. Installationen kan ta upp till två minuter att slutföra."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS slutfördes. Ansluter till nätverket ..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Ansluten till Wi-Fi-nätverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS pågår redan och kan ta upp till två minuter att slutföra"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS misslyckades. Försök igen om några minuter."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Säkerhetsinställningen för den trådlösa routern (WEP) stöds inte"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Säkerhetsinställningen för den trådlösa routern (TKIP) stöds inte"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentiseringsfel. Försök igen."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"En annan WPS-session upptäcktes. Försök igen om några minuter."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Nätverks-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Säkerhet"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signalstyrka"</string>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 2900185..0ff6af6 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -79,10 +79,34 @@
     <item msgid="4907380534957572531">"Juu"</item>
     <item msgid="4699640516390840297">"Juu sana"</item>
   </string-array>
-    <!-- no translation found for wifi_status:10 (6367044185730295334) -->
-    <!-- no translation found for wifi_status:11 (503942654197908005) -->
-    <!-- no translation found for wifi_status_with_ssid:10 (5660739516542454527) -->
-    <!-- no translation found for wifi_status_with_ssid:11 (1805837518286731242) -->
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Inasafisha..."</item>
+    <item msgid="8513729475867537913">"Inaunganisha…"</item>
+    <item msgid="515055375277271756">"Uhalalishaji..."</item>
+    <item msgid="1943354004029184381">"Inapata anwani ya Ip..."</item>
+    <item msgid="4221763391123233270">"Umeunganishwa"</item>
+    <item msgid="624838831631122137">"Imesimamishwa"</item>
+    <item msgid="7979680559596111948">"Inakatisha muunganisho..."</item>
+    <item msgid="1634960474403853625">"Muunganisho Umekatika"</item>
+    <item msgid="746097431216080650">"Haijafanikiwa"</item>
+    <item msgid="6367044185730295334">"Imezuiwa"</item>
+    <item msgid="503942654197908005">"Inaepuka kwa muda muunganisho mbovu"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Inasafisha..."</item>
+    <item msgid="355508996603873860">"Inaunganisha kwa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Uhalalishaji kwa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Inamiliki anwani ya IP kutoka <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">" Umeunganishwa kwa<xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Imesimamishwa"</item>
+    <item msgid="7698638434317271902">"inakatisha muunganisho kutoka <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Muunganisho Umekatika"</item>
+    <item msgid="8578370891960825148">"Haijafanikiwa"</item>
+    <item msgid="5660739516542454527">"Imezuiwa"</item>
+    <item msgid="1805837518286731242">"Inaepuka kwa muda muunganisho mbovu"</item>
+  </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
     <!-- no translation found for wifi_security:2 (1532568756571457140) -->
@@ -90,7 +114,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_eap_method:3 (435667726254379514) -->
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"PEAP"</item>
+    <item msgid="7981731051382306293">"TLS"</item>
+    <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Kichupo cha kusukuma"</item>
     <item msgid="1624323946324499595">"PIN kutoka kwa kifaa cha rika"</item>
@@ -135,7 +164,12 @@
     <item msgid="3703676222230317933">"Zindua hesabu"</item>
     <item msgid="2502754479975776899">"Jina la Prog"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:3 (2318274046749286642) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Hamna"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 851109d..dc2e83d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -559,14 +559,11 @@
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", imelindwa na <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Hamna"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Unganisha"</string>
-    <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
-    <skip />
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ilishindwa kuunganisha kwa mtandao"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Sahau"</string>
-    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
-    <skip />
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Imeshindwa kusahau mtandao"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Hifadhi"</string>
-    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
-    <skip />
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Imeshindwa kuhifadhi mtandao"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Ghairi"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Mtandao hewa mahiri"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Bendi ya masafa ya mtandao-hewa"</string>
@@ -1574,21 +1571,14 @@
     <string name="vpn_cancel" msgid="1979937976123659332">"Ghairi"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Hifadhi"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Unganisha"</string>
-    <!-- no translation found for vpn_edit (8647191407179996943) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (5965299358485793260) -->
-    <skip />
+    <string name="vpn_edit" msgid="8647191407179996943">"Hariri maelezo mafupi ya VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Unganisha kwa <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <!-- no translation found for vpn_create (5628219087569761496) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (408275284159243490) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (8098021690546891414) -->
-    <skip />
-    <!-- no translation found for vpn_no_network (3050233675132726155) -->
-    <skip />
-    <!-- no translation found for vpn_missing_cert (7972907102570411501) -->
-    <skip />
+    <string name="vpn_create" msgid="5628219087569761496">"Ongeza maelezo mafupi ya  VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Hariri maelezo mafupi"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Futa maelezo mafupi"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Hakuna muunganisho wa mtandao. Tafadhali jaribu tena baadaye."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Cheti hakipo. Tafadhali hariri maelezo mafupi."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Mfumo"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Mtumiaji"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Lemaza"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0460c6e..29e7f4f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Nagkaproblema sa pagbabago ng setting"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Magdagdag ng network"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Mga Wi-Fi network"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Push Button ng WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Entry ng Pin ng WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"I-scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Advanced"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Kumonekta sa network"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Baguhin ang network"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Upang makita ang mga available na network, i-on ang Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Ipakita ang mga advanced na pagpipilian"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Protektadong Setup ng Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Sinisimulan ang WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Pindutin ang button na WPS sa iyong router ng Wi-Fi. Maaaring tumagal nang hanggang dalawang minuto upang makumpleto ang pag-setup."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Ilagay ang pin na <xliff:g id="PIN">%1$s</xliff:g> sa iyong router ng Wi-Fi. Maaaring tumagal nang hanggang dalawang minuto upang makumpleto ang pag-setup."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Nagtagumpay ang WPS. Kumokonekta sa network…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Nakakonekta sa Wi-Fi na network na <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Umuusad na ang WPS at maaaring tumagal nang dalawang minuto upang makumpleto"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Nabigo ang WPS. Pakisubukang muli sa loob ng ilang minuto."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Hindi sinusuportahan ang setting ng seguridad ng wireless na router (WEP)"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Hindi sinusuportahan ang setting ng seguridad ng wireless na router (TKIP)"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Pagkabigo sa pagpapatotoo. Pakisubukang muli."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Natunton ang isa pang sesyon ng WPS. Pakisubukang muli sa loob ng ilang minuto."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Network SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Lakas ng signal"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ec13a4b..d7a8767 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ayarı değiştirirken bir sorun oluştu"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ağ ekle"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Kablosuz ağlar"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Düğmesi"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS Pin Girişi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tara"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Gelişmiş"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Ağa bağlan"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ağı değiştir"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Kullanılabilir ağları görmek için, Kablosuz\'u açın."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Gelişmiş seçenekleri göster"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Kablosuz Korumalı Kurulum"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS başlatılıyor…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Kablosuz yönlendiricinizdeki WPS düğmesine basın. Kurulum işleminin tamamlanması iki dakika kadar sürebilir."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Kablosuz yönlendiricinizde <xliff:g id="PIN">%1$s</xliff:g> pin kodunu girin. Kurulum işleminin tamamlanması iki dakika kadar sürebilir."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS başarılı oldu. Ağa bağlanılıyor…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Kablosuz ağına bağlanıldı"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS kurulumu zaten devam ediyor ve tamamlanması iki dakika kadar sürebilir"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS başarısız oldu. Lütfen birkaç dakika içinde tekrar deneyin."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Kablosuz yönlendirici güvenlik ayarı (WEP) desteklenmiyor"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Kablosuz yönlendirici güvenlik ayarı (TKIP) desteklenmiyor"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Kimlik doğrulama başarısız oldu. Lütfen tekrar deneyin."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Başka bir WPS oturumu saptandı. Lütfen birkaç dakika sonra tekrar deneyin."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Ağ SSID\'si"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Güvenlik"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Sinyal gücü"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 64ba740..b244847 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Виникла проблема зі зміною налаштувань"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Додати мережу"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi мережі"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Кнопка WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Введення PIN-коду WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Сканув."</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Додатково"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Підключ. до мережі"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Змінити мережу"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Щоб переглянути доступні мережі, увімкніть Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Показати розширені параметри"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Налаштування захищеної мережі Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Запуск WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Натисніть кнопку WPS на своєму маршрутизаторі Wi-Fi. Налаштування може тривати не більше двох хвилин."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Введіть pin-код <xliff:g id="PIN">%1$s</xliff:g> на своєму маршрутизаторі Wi-Fi. Налаштування може тривати не більше двох хвилин."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS запущено. Під’єднання до мережі..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"З’єднано з мережею Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Налаштування WPS уже виконується, для його завершення потрібно не більше двох хвилин."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Помилка WPS. Повторіть спробу через декілька хвилин."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Налаштування безпеки бездротового маршрутизатора (WEP) не підтримується"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Налаштування безпеки бездротового маршрутизатора (TKIP) не підтримується"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Помилка автентифікації. Повторіть спробу."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Виявлено ще один сеанс WPS. Повторіть спробу через декілька хвилин."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID мережі"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Безпека"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Сила сигналу:"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d60f50d..8efc734 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Đã xảy ra sự cố khi thay đổi cài đặt"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Thêm mạng"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Mạng Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Nút Đẩy WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Mục nhập mã pin WPS"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Dò"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Nâng cao"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Kết nối tới mạng"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Sửa đổi mạng"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Để xem các mạng có sẵn, hãy bật Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Hiển thị tùy chọn nâng cao"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Thiết lập Wi-Fi được bảo vệ"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Đang khởi động WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Đẩy nút WPS trên bộ định tuyến Wi-Fi của bạn. Thiết lập có thể mất tới hai phút để hoàn tất."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Nhập mã pin <xliff:g id="PIN">%1$s</xliff:g> trên bộ định tuyến Wi-Fi của bạn. Thiết lập có thể mất tới hai phút để hoàn tất."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS đã thành công. Đang kết nối với mạng…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Đã kết nối với mạng Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS đã được xử lý và có thể mất tối đa hai giây để hoàn tất"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS không thành công. Vui lòng thử lại sau ít phút."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Cài đặt bảo mật bộ định tuyến không dây (WEP) không được hỗ trợ"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Cài đặt bảo mật bộ định tuyến không dây (TKIP) không được hỗ trợ"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Xác thực không thành công. Vui lòng thử lại."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Đã phát hiện một phiên WPS khác. Vui lòng thử lại sau ít phút."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID Mạng"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Bảo mật"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Cường độ tín hiệu"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 424d308..2c8496b 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -79,10 +79,34 @@
     <item msgid="4907380534957572531">"高"</item>
     <item msgid="4699640516390840297">"很高"</item>
   </string-array>
-    <!-- no translation found for wifi_status:10 (6367044185730295334) -->
-    <!-- no translation found for wifi_status:11 (503942654197908005) -->
-    <!-- no translation found for wifi_status_with_ssid:10 (5660739516542454527) -->
-    <!-- no translation found for wifi_status_with_ssid:11 (1805837518286731242) -->
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"正在扫描..."</item>
+    <item msgid="8513729475867537913">"正在连接..."</item>
+    <item msgid="515055375277271756">"正在进行身份验证..."</item>
+    <item msgid="1943354004029184381">"正在获取 IP 地址..."</item>
+    <item msgid="4221763391123233270">"已连接"</item>
+    <item msgid="624838831631122137">"已暂停"</item>
+    <item msgid="7979680559596111948">"正在断开连接..."</item>
+    <item msgid="1634960474403853625">"已断开连接"</item>
+    <item msgid="746097431216080650">"失败"</item>
+    <item msgid="6367044185730295334">"已阻止"</item>
+    <item msgid="503942654197908005">"暂时关闭状况不佳的连接"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"正在扫描..."</item>
+    <item msgid="355508996603873860">"正在连接到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"正在通过 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 进行身份验证..."</item>
+    <item msgid="7928343808033020343">"正在从 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 获取 IP 地址..."</item>
+    <item msgid="8937994881315223448">"已连接到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"已暂停"</item>
+    <item msgid="7698638434317271902">"正在断开与 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的连接..."</item>
+    <item msgid="197508606402264311">"已断开连接"</item>
+    <item msgid="8578370891960825148">"失败"</item>
+    <item msgid="5660739516542454527">"已阻止"</item>
+    <item msgid="1805837518286731242">"暂时关闭状况不佳的连接"</item>
+  </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
     <!-- no translation found for wifi_security:2 (1532568756571457140) -->
@@ -90,7 +114,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_eap_method:3 (435667726254379514) -->
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"PEAP"</item>
+    <item msgid="7981731051382306293">"TLS"</item>
+    <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
+  </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"按钮"</item>
     <item msgid="1624323946324499595">"从对等设备获取的 PIN"</item>
@@ -135,7 +164,12 @@
     <item msgid="3703676222230317933">"启动次数"</item>
     <item msgid="2502754479975776899">"应用程序名称"</item>
   </string-array>
-    <!-- no translation found for wifi_eap_entries:3 (2318274046749286642) -->
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"无"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d62a897..dc61f82 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -569,14 +569,11 @@
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"，通过<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>进行保护"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"无"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"连接"</string>
-    <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
-    <skip />
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"无法连接网络"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"不保存"</string>
-    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
-    <skip />
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"无法取消保存网络"</string>
     <string name="wifi_save" msgid="3331121567988522826">"保存"</string>
-    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
-    <skip />
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"无法保存网络"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"取消"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"高级 Wi-Fi 设置"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi 频带"</string>
@@ -1584,21 +1581,14 @@
     <string name="vpn_cancel" msgid="1979937976123659332">"取消"</string>
     <string name="vpn_save" msgid="4233484051644764510">"保存"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"连接"</string>
-    <!-- no translation found for vpn_edit (8647191407179996943) -->
-    <skip />
-    <!-- no translation found for vpn_connect_to (5965299358485793260) -->
-    <skip />
+    <string name="vpn_edit" msgid="8647191407179996943">"修改 VPN 配置文件"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"连接到<xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <!-- no translation found for vpn_create (5628219087569761496) -->
-    <skip />
-    <!-- no translation found for vpn_menu_edit (408275284159243490) -->
-    <skip />
-    <!-- no translation found for vpn_menu_delete (8098021690546891414) -->
-    <skip />
-    <!-- no translation found for vpn_no_network (3050233675132726155) -->
-    <skip />
-    <!-- no translation found for vpn_missing_cert (7972907102570411501) -->
-    <skip />
+    <string name="vpn_create" msgid="5628219087569761496">"添加 VPN 配置文件"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"修改配置文件"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"删除配置文件"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"目前没有网络连接。请稍后重试。"</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"缺失证书。请修改配置文件。"</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"系统"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"用户"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"停用"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 5288447..4c77f56 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -504,10 +504,8 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kube khona inkinga yokushintsha ilungiselelo"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Yengeza inethiwekhi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Amanethiwekhi e-Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
-    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Inkinobho yokuphusha i-WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS Pin Entry"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skena"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Thuthukisiwe"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Xhuma kwinethiwekhi"</string>
@@ -515,30 +513,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Guqula inethiwekhi"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Ukubona amanethiwekhi atholakalayo, vula i-WiFi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Bonisa okukhethwa kukho okuseqophelweni"</string>
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
-    <skip />
-    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (1054681318528153733) -->
-    <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8177854490806936836) -->
-    <skip />
-    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
-    <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
-    <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
-    <skip />
-    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
-    <skip />
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Isethaphu Evikelwe Yokuxhumana kungenazintamnbo"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iqala i-WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Cindezela inkinobho ye-WPS ku-Wi-Fi router yakho. Ukustha kungathatha kufika emaminithini amabili ukuqedela."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Faka i-pin <xliff:g id="PIN">%1$s</xliff:g> ku-Wi-Fi router yakho. Ukusetha kungathatha kufika emaminithini amabili ukuqedela."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"I-WPS iphumelele. Ixhuma kunethiwekhi…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Ixhunywe kwinethiwekhi ye-<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"I-WPS isivele iyaqhubeka futhi ingathatha kufika kumaminithi amabili ukuqedela"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"I-WPS yehlulekile. Sicela uzame futhi emaminithini ambalawa."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Izilungiselelo zokuphepha zendlela engenazintambo (WEP) azisekelwe"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Izilungiselelo zokuphepha zendlela engenazintambo (TKIP) azisekelwe"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Ukwehluleka kokugunyazwa. Sicela uzame futhi."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Esinye isikhathi se-WPS sitholiwe. Sicela uzame futhi emaminithini ambalwa."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"i-SSID Yenethiwekhi"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Ukuphepha"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Amandla esiginali"</string>
@@ -1072,9 +1058,9 @@
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> inqubo <xliff:g id="NUMSERVICES">%2$d</xliff:g> nensizakalo"</string>
-    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> izinqubo <xliff:g id="NUMSERVICES">%2$d</xliff:g> nezinsizakalo"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> izinqubo <xliff:g id="NUMSERVICES">%2$d</xliff:g> namasevisi"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> izinqubo kanye <xliff:g id="NUMSERVICES">%2$d</xliff:g> nensizakalo"</string>
-    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> izinqubo <xliff:g id="NUMSERVICES">%2$d</xliff:g> nezinsizakalo"</string>
+    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> izinqubo <xliff:g id="NUMSERVICES">%2$d</xliff:g> namasevisi"</string>
     <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"Uhlelo lokusebenza olusebenzayo"</string>
     <string name="no_services" msgid="7133900764462288263">"Akusebenzi"</string>
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"Amasevisi"</string>