diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 77ea67bc0ca..0a4c3afe999 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netwerke"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-drukknoppie"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN-kode"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 3d3bc6027a8..b0f47b532a6 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"የWi-Fi  አውታረመረቦች"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS ግፊት አዘራር"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS ፒን ማስገቢያ"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ቃኝ"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"ከፍተኛ"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ወደ አውታረ መረብ አያይዝ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 68aef3a6df9..f8d9e31d412 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"شبكات Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"زر دفع WPS"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"إدخال رقم التعريف الشخصي في WPS"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"فحص"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"متقدم"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"اتصال بالشبكة"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index bfcfa4b2ed1..04e625c1287 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Сеткі Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Кнопка WPS"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Увод PIN-кода WPS"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Сканаваць"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Пашыраныя налады"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Падлучыцца да сеткі"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 5da1ec150ed..c06f53f5695 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -504,9 +504,9 @@
     <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) -->
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Бутон за WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Въвеждане на WPS ПИН"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
     <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Сканиране"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Разширени"</string>
@@ -515,30 +515,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-ca/strings.xml b/res/values-ca/strings.xml
index 7de7db5ac4e..c49420094da 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Xarxes Wi-fi"</string>
     <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>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 66c9f2d8722..9a4f9717d6e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Sítě WiFi"</string>
     <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>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 028f5b8822f..94f07d6e67c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netværk"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-trykknap"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Angiv WPS-pinkode"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 84f9ab583b3..6ce500c8863 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -507,6 +507,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"WLAN-Netzwerke"</string>
     <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>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index a3f0f21fe5a..f6fbe016768 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Δίκτυα Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Κουμπί WPS"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Εισαγ. κωδ. Pin WPS"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Σάρωση"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Σύνθετα"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Σύνδεση στο δίκτυο"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6a2fc1989dc..b999a7d6fa4 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi networks"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Push Button"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS Pin Entry"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 6b971efcc1d..2c7daa536fd 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -90,8 +90,8 @@
     <item msgid="7979680559596111948">"Desconectando…"</item>
     <item msgid="1634960474403853625">"Desconectado"</item>
     <item msgid="746097431216080650">"Incorrecto"</item>
-    <item msgid="6367044185730295334">"Bloqueado"</item>
-    <item msgid="503942654197908005">"Evitar temporalmente mala conexión"</item>
+    <item msgid="6367044185730295334">"Bloqueada"</item>
+    <item msgid="503942654197908005">"Desactivando mala conexión  temporalmente"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -104,8 +104,8 @@
     <item msgid="7698638434317271902">"Desconectando de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Desconectado"</item>
     <item msgid="8578370891960825148">"Incorrecto"</item>
-    <item msgid="5660739516542454527">"Bloqueado"</item>
-    <item msgid="1805837518286731242">"Evitar temporalmente mala conexión"</item>
+    <item msgid="5660739516542454527">"Bloqueada"</item>
+    <item msgid="1805837518286731242">"Desactivando mala conexión  temporalmente"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d4fb054ab28..e3922211c7e 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
     <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>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
@@ -555,11 +557,11 @@
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ninguna"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
-    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Se produjo un error al establecer conexión con la red."</string>
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"No se pudo establecer conexión con la red."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Olvidar"</string>
-    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Se produjo un error al borrar la red."</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"No se pudo borrar la red."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
-    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Se produjo un error al guardar la red."</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"No se pudo guardar la red."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi avanzada"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de frecuencia Wi-Fi"</string>
@@ -1570,11 +1572,11 @@
     <string name="vpn_edit" msgid="8647191407179996943">"Editar perfil de VPN"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"Conectar a <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <string name="vpn_create" msgid="5628219087569761496">"Añadir perfil VPN"</string>
+    <string name="vpn_create" msgid="5628219087569761496">"Agregar perfil VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Modificar perfil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Eliminar perfil"</string>
-    <string name="vpn_no_network" msgid="3050233675132726155">"No hay conexión de red. Por favor, inténtelo de nuevo más tarde."</string>
-    <string name="vpn_missing_cert" msgid="7972907102570411501">"No se encuentra un certificado. Por favor, editar el perfil."</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"No hay conexión de red. Inténtalo de nuevo más tarde."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"No se encuentra un certificado. Modifica el perfil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Usuario"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Inhabilitar"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c0c553772dd..ea8b51153ce 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botón push WPS"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"PIN WPS"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 1cbdf7eda01..8138b667406 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"WiFi-võrgud"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-nupp"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-i kirje"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index fbd00d57cfb..579f5716763 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"شبکه های Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"دکمه ارسال WPS"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"ورودی پین WPS"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"اسکن"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"پیشرفته"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"اتصال به شبکه"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 0fa3fdcaccd..82f8db85dbe 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Wifi-verkot"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-painike"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 811f5048094..7b0c6d1e1b4 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Réseaux Wi-Fi"</string>
     <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>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index fd5814557ab..9199d728bcc 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi नेटवर्क"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS पुश बटन"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS पिन प्रविष्टि"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"स्कैन करें"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"उन्नत"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"नेटवर्क से कनेक्‍ट करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index bdb030a147d..3dcd7158db0 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi mreže"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS gumb"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Unos WPS PIN-a"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
@@ -516,8 +518,7 @@
     <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 />
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Unesite <xliff:g id="PIN">%1$s</xliff:g> u usmjerivač mreže Wi-Fi. Do dovršetka postavljanja može proteći do dvije minute."</string>
     <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>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index ae1f4cfb359..7a0e9d25eed 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi hálózatok"</string>
     <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>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e3514179477..9fe7a6e09da 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Jaringan Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tombol Tekan WPS"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Entri Pin WPS"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8ba7068eafc..c5ea6c67870 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Reti Wi-Fi"</string>
     <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>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c975bd14036..34ffaecae44 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"רשתות Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"לחצן WPS"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"הזנת PIN ‏של WPS"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"סרוק"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"מתקדם"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"התחבר לרשת"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d9c9c82973f..f305bb31c97 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -506,9 +506,9 @@
     <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) -->
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPSプッシュボタン式"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN入力式"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
     <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"スキャン"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"詳細設定"</string>
@@ -517,30 +517,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ネットワークを変更"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"利用可能なネットワークを表示するにはWi-FiをON"</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ボタンを押します。セットアップの完了まで最大2分程度かかることがあります。"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"無線ルーターでPin「<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-ko/strings.xml b/res/values-ko/strings.xml
index 8c82d5f639a..b86958ca775 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 네트워크"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS 누르기 버튼"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN 입력"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"검색"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"고급"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"네트워크 연결"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1cd5412c1fa..486c2ccaa0a 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"„Wi-Fi“ tinklai"</string>
     <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>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index f83f3a69f9d..a92dc3efe80 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi tīkli"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS spiedpoga"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN ievade"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index e8570a1f8d3..ce0e4b5a4ac 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -504,9 +504,9 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Terdapat masalah menukar tetapan"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Tambah rangkaian"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Rangkaian Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Butang Tekan WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Masukan Pin WPS"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
     <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Imbas"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Terperinci"</string>
@@ -515,30 +515,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ubah suai"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Untuk melihat rangkaian tersedia, hidupkan Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Tunjukkan pilihan terperinci"</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">"Persediaan Terlindung Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Memulakan WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Tekan butang WPS pada penghala Wi-Fi anda. Persediaan ini boleh mengambil masa sehingga dua minit untuk selesai."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Masukkan pin <xliff:g id="PIN">%1$s</xliff:g> pada penghala Wi-Fi anda. Persediaan ini boleh mengambil masa sehingga dua minit untuk selesai."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS berjaya. Menyambung ke rangkaian…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Disambungkan ke rangkaian Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS sudah pun dijalankan dan boleh mengambil masa sehingga dua minit untuk selesai"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS gagal. Sila cuba lagi dalam beberapa minit."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Tetapan keselamatan penghala wayarles (WEP) tidak disokong"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Tetapan keselamatan penghala wayarles (TKIP) tidak disokong"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Pengesahan gagal. Sila cuba lagi."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Sesi WPS lain dikesan. Sila cuba lagi dalam beberapa minit."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID rangkaian"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Keselamatan"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Kekuatan isyarat"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f4546f57e44..045536156d0 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Trådløse nettverk"</string>
     <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>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 12e5e89b66d..3bfebb0a0fd 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netwerken"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-knop"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-pin"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9abd10e443d..4ffb803f36d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Sieci Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Przycisk WPS"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Wpisz PIN WPS"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index af9cd0f8c3f..f870cade33a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
     <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>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index c9aac619477..c5914c2da9e 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
     <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>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 6b427854235..6230fc17f77 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -729,6 +729,8 @@
     <skip />
     <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
     <skip />
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tschertgar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanzà"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connectar cun la rait"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1ee932e3d4b..ad7824df4ef 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -504,9 +504,9 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"A apărut o problemă la modificarea setării"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Adăugaţi o reţea"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Reţele Wi-Fi"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Buton WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Introduceţi PIN WPS"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
     <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scanaţi"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avansate"</string>
@@ -515,30 +515,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificaţi reţeaua"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Pt. a vedea reţelele disponibile, activaţi Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Afişaţi opţiunile avansate"</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">"Configurare protejată Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Se porneşte WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Apăsaţi pe butonul WPS de pe routerul Wi-Fi. Configurarea poate dura până la două minute pentru a se finaliza."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Introduceţi codul <xliff:g id="PIN">%1$s</xliff:g> pe routerul Wi-Fi. Configurarea poate dura până la două minute pentru a se finaliza."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS finalizată. Se conectează la reţea…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Conectat la reţeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Configurarea WPS este deja în desfăşurare şi poate dura până la două minute pentru a se finaliza"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS eşuată. Încercaţi din nou peste câteva minute."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Setarea de securitate pentru routerul wireless (WEP) nu este acceptată"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Setarea de securitate pentru routerul wireless (TKIP) nu este acceptată"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentificare eşuată. Încercaţi din nou."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"A fost detectată altă sesiune WPS. Încercaţi din nou peste câteva minute."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID reţea"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Securitatea"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Putere semnal"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 41bd58c67c0..e6cd6cf2987 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Сети Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Кнопка WPS"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Вход по PIN-коду WPS"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Поиск"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Дополнительные функции"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Подключиться к сети"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6d4e53a03b8..efb228f914b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Siete Wi-Fi"</string>
     <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>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
@@ -516,8 +518,7 @@
     <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 />
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Zadajte vo svojom smerovači siete Wi-Fi kód <xliff:g id="PIN">%1$s</xliff:g>. Proces nastavenia môže trvať až dve minúty."</string>
     <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>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 8137f56e280..ef374b6e3ca 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Brezžična omrežja"</string>
     <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>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 2d4c3f824c4..2c0b970654b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi мреже"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS дугме"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Унос WPS PIN-а"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Скенирај"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Напредно"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Повежи са мрежом"</string>
@@ -516,8 +518,7 @@
     <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 />
+    <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>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d897796b93d..26592d652d5 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-nätverk"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-tryckknapp"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index dc2e83d4d7a..2235e47a450 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -494,9 +494,9 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kulikuwa na hitilafu wakati wa kubadilisha mipangilio"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ongeza mtandao"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Mitandao-hewa"</string>
-    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
-    <skip />
-    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Kitufe cha kusukuma cha WSP"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Kiingilio cha Pin ya WPS"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
     <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tafuta"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Mahiri"</string>
@@ -505,30 +505,18 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Mtandao umerekebishwa"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Ili kutazama mitandao inayopatikana, washa Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Onyesha chaguo za kindani"</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">"Usanidi Uliolindwa na Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Kuanzisha WPS ..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"Sukuma kitufe cha WPS kwenye kipanga njia chako cha Wi-Fi. Usanidi unaweza kuchukua hadi dakika mbili kukamilika."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Ingiza pin <xliff:g id="PIN">%1$s</xliff:g> kwenye kipanga njia chako cha Wi-Fi. Usanidi unaweza kuchukua hadi dakika mbili ili kukamilika."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS imefanikiwa. Inaunganisha kwenye mtandao..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Umeunganishwa kwa mtandao wa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS tayari inaendelea na inaweza kuchukua hadi dakika mbili kukamilika"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS imeshindwa. Tafadhali jaribu tena baada ya dakika chache."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Mpangilio wa usalama wa kipanga njia pasiwaya (WEP) hauauniwi."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Mpangilio wa usalama wa kipanga njia pasiwaya (TKIP) hauauniwi."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Imeshindwa kuthibitisha. Tafadhali jaribu tena."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Kipindi kingine cha WPS kimegunduliwa. Tafadhali jaribu tena baada ya dakika chache."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Mtandao wa SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Usalama"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Nguvu za mawimbi"</string>
@@ -1578,7 +1566,7 @@
     <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="vpn_missing_cert" msgid="7972907102570411501">"Cheti fulani 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-th/strings.xml b/res/values-th/strings.xml
index 9a93773f828..132e86bf9ba 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -504,9 +504,9 @@
     <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) -->
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"ปุ่มกด WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"ข้อมูล Pin WPS"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
     <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"สแกน"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"ขั้นสูง"</string>
@@ -515,30 +515,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-tl/strings.xml b/res/values-tl/strings.xml
index 29e7f4f9df4..36624594844 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Mga Wi-Fi network"</string>
     <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>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d7a87678d0a..3eac0883120 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Kablosuz ağlar"</string>
     <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>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b244847c737..e4fa02bbc93 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi мережі"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Кнопка WPS"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Введення PIN-коду WPS"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Сканув."</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Додатково"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Підключ. до мережі"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 8efc734764f..0d59249f78f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -506,6 +506,8 @@
     <string name="wifi_access_points" msgid="2664629396767022441">"Mạng Wi-Fi"</string>
     <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>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
@@ -1571,8 +1573,8 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"Kết nối với <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Thêm cấu hình VPN"</string>
-    <string name="vpn_menu_edit" msgid="408275284159243490">"Chỉnh sửa tiểu sử"</string>
-    <string name="vpn_menu_delete" msgid="8098021690546891414">"Xóa tiểu sử"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Chỉnh sửa cấu hình"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Xóa cấu hình"</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Không có kết nối mạng. Vui lòng thử lại sau."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Thiếu chứng chỉ. Vui lòng chỉnh sửa tiểu sử."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Hệ thống"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index dc61f829355..eaffad53a3f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -504,9 +504,9 @@
     <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) -->
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS 按钮"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN 输入"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
     <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"扫描"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"高级"</string>
@@ -515,30 +515,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-Fi 路由器上的 pin <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>
@@ -1588,7 +1576,7 @@
     <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="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-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9f8c7adf4d4..ee8c9ed4a3e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -504,9 +504,9 @@
     <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) -->
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS 按鈕"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"輸入 WPS 個人識別碼"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
     <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"掃描"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"進階"</string>
@@ -515,30 +515,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">"WiFi 保護設定"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"正在啟動 WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="1054681318528153733">"按下 WiFi 路由器上的 WPS 按鈕，最多需要兩分鐘才能完成設定。"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"在 WiFi 路由器上輸入個人識別碼 <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">"已連線至 WiFi 網路 <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-zu/strings.xml b/res/values-zu/strings.xml
index 4c77f5634a2..a9c2226ee7b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -504,8 +504,10 @@
     <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>
-    <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_wps_pbc" msgid="2668564692207863017">"Inkinobho yokuphusha ye-WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Ukufakwa kwe-PIN ye-WPS"</string>
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
@@ -513,12 +515,12 @@
     <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>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Isethaphu Evikelwe Yokuxhumana kungenazintamnbo"</string>
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Ukusethwa Okuvikelwe kwe-Wi-Fi"</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_onstart_pbc" msgid="1054681318528153733">"Cindezela inkinobho ye-WPS ku-Wi-Fi router yakho. Ukusetha kungathatha kufika emaminithini amabili ukuqedela."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8177854490806936836">"Faka le-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_connected" msgid="5754399645462924103">"Ixhunywe kwinethiwekhi ye-Wi-Fi i-<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>