From f012a9dd14d7a7d40417a219094de9a3aab7ad18 Mon Sep 17 00:00:00 2001
From: Russell Brenner <russellbrenner@google.com>
Date: Fri, 19 Oct 2012 18:55:14 -0700
Subject: [PATCH 1/4] Added info about why Wi-Fi is required

Added a new optional textview to wifi settings, informing that wifi
is required during setup. For use on Nakasi 3G.

Bug: 7383934
Change-Id: I231472438e61ccddedc1e680a362f90738d64a2d
---
 res/layout/setup_preference.xml                 | 11 ++++++++++-
 res/values/strings.xml                          |  4 +++-
 src/com/android/settings/wifi/WifiSettings.java | 10 +++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index c2f698922ee..04e120c5c57 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -74,6 +74,15 @@
         android:background="@android:color/transparent"
         android:orientation="vertical" >
 
+        <TextView
+            android:id="@+id/wifi_required_info"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="6dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/wifi_required_info_text"
+            android:visibility="gone" />
+
         <ListView
             android:id="@android:id/list"
             android:layout_width="match_parent"
@@ -180,4 +189,4 @@
                 </LinearLayout>
         </RelativeLayout>
     </LinearLayout>
-</view>
\ No newline at end of file
+</view>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6eb2a265f13..236c0b3ab52 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -32,7 +32,7 @@
     <string name="show_dev_on">You are now a developer!</string>
     <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
     <string name="show_dev_already">No need, you are already a developer.</string>
-    
+
     <!-- Category headings in left-pane header menu --> <skip />
     <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
     <string name="header_category_wireless_networks">WIRELESS &amp; NETWORKS</string>
@@ -1317,6 +1317,8 @@
     <string name="wifi_more">More</string>
     <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
     <string name="wifi_setup_wps">Automatic setup (WPS)</string>
+    <!-- Message informing that wifi is required during setup [CHAR LIMIT=NONE] -->
+    <string name="wifi_required_info_text">To complete setup, your tablet needs access to Wi-Fi. After setup, you can switch between mobile data and Wi-Fi.</string>
 
     <!-- Dialog for Access Points --> <skip />
     <!-- Label to show/hide advanced options -->
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 9c3f07fe8c7..aedb79e536b 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -152,6 +152,9 @@ public class WifiSettings extends SettingsPreferenceFragment
     // this boolean extra shows a custom button that we can control
     protected static final String EXTRA_SHOW_CUSTOM_BUTTON = "wifi_show_custom_button";
 
+    // show a text regarding data charges when wifi connection is required during setup wizard
+    protected static final String EXTRA_SHOW_WIFI_REQUIRED_INFO = "wifi_show_wifi_required_info";
+
     // this boolean extra is set if we are being invoked by the Setup Wizard
     private static final String EXTRA_IS_FIRST_RUN = "firstRun";
 
@@ -238,7 +241,8 @@ public class WifiSettings extends SettingsPreferenceFragment
                 });
             }
 
-            if (getActivity().getIntent().getBooleanExtra(EXTRA_SHOW_CUSTOM_BUTTON, false)) {
+            Intent intent = getActivity().getIntent();
+            if (intent.getBooleanExtra(EXTRA_SHOW_CUSTOM_BUTTON, false)) {
                 view.findViewById(R.id.button_bar).setVisibility(View.VISIBLE);
                 view.findViewById(R.id.back_button).setVisibility(View.INVISIBLE);
                 view.findViewById(R.id.skip_button).setVisibility(View.INVISIBLE);
@@ -258,6 +262,10 @@ public class WifiSettings extends SettingsPreferenceFragment
                 });
             }
 
+            if (intent.getBooleanExtra(EXTRA_SHOW_WIFI_REQUIRED_INFO, false)) {
+                view.findViewById(R.id.wifi_required_info).setVisibility(View.VISIBLE);
+            }
+
             return view;
         } else {
             return super.onCreateView(inflater, container, savedInstanceState);

From adc728fe66ed84eb2601deda265c2aa68dc28269 Mon Sep 17 00:00:00 2001
From: Russell Brenner <russellbrenner@google.com>
Date: Tue, 23 Oct 2012 10:45:03 -0700
Subject: [PATCH 2/4] Fix layout with no access points

The "Searching for Wi-Fi" message was filling it's view parent,
pushing the "Other network..." option and Skip button out of view.

Bug: 7335738
Change-Id: I6fd1ceff67e04385c6e325ec4bb8a2e30f38c924
---
 res/layout/setup_preference.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index 04e120c5c57..9ae39bc8f47 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -97,7 +97,8 @@
         <TextView
             android:id="@android:id/empty"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="0px"
+            android:layout_weight="1"
             android:gravity="center"
             android:visibility="gone" />
 

From 828f5235eeead84c52041fd7bafb289a71793955 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Mon, 22 Oct 2012 14:42:21 -0700
Subject: [PATCH 3/4] Manually enter translations for msgid:
 9014073093293520112

Per discussion with Maarten / pbrady, enter empty string for
untranslated languages.

Bug: 7383934
Change-Id: I0faa661820e1cb39603327f8d7d748535249e75d

Conflicts:

	res/values-af/strings.xml
	res/values-am/strings.xml
	res/values-ar/strings.xml
	res/values-be/strings.xml
	res/values-bg/strings.xml
	res/values-ca/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-en-rGB/strings.xml
	res/values-es-rUS/strings.xml
	res/values-es/strings.xml
	res/values-et/strings.xml
	res/values-fa/strings.xml
	res/values-fi/strings.xml
	res/values-fr/strings.xml
	res/values-hi/strings.xml
	res/values-hr/strings.xml
	res/values-hu/strings.xml
	res/values-in/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-ja/strings.xml
	res/values-ko/strings.xml
	res/values-lt/strings.xml
	res/values-lv/strings.xml
	res/values-ms/strings.xml
	res/values-nb/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-pt/strings.xml
	res/values-rm/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-sk/strings.xml
	res/values-sl/strings.xml
	res/values-sr/strings.xml
	res/values-sv/strings.xml
	res/values-sw/strings.xml
	res/values-th/strings.xml
	res/values-tl/strings.xml
	res/values-tr/strings.xml
	res/values-uk/strings.xml
	res/values-vi/strings.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/strings.xml
	res/values-zu/strings.xml
---
 res/values-af/strings.xml     | 1 +
 res/values-am/strings.xml     | 1 +
 res/values-ar/strings.xml     | 1 +
 res/values-be/strings.xml     | 1 +
 res/values-bg/strings.xml     | 1 +
 res/values-ca/strings.xml     | 1 +
 res/values-cs/strings.xml     | 1 +
 res/values-da/strings.xml     | 1 +
 res/values-de/strings.xml     | 1 +
 res/values-el/strings.xml     | 1 +
 res/values-en-rGB/strings.xml | 1 +
 res/values-es-rUS/strings.xml | 1 +
 res/values-es/strings.xml     | 1 +
 res/values-et/strings.xml     | 1 +
 res/values-fa/strings.xml     | 1 +
 res/values-fi/strings.xml     | 1 +
 res/values-fr/strings.xml     | 1 +
 res/values-hi/strings.xml     | 1 +
 res/values-hr/strings.xml     | 1 +
 res/values-hu/strings.xml     | 1 +
 res/values-in/strings.xml     | 1 +
 res/values-it/strings.xml     | 1 +
 res/values-iw/strings.xml     | 1 +
 res/values-ja/strings.xml     | 1 +
 res/values-ko/strings.xml     | 1 +
 res/values-lt/strings.xml     | 1 +
 res/values-lv/strings.xml     | 1 +
 res/values-ms/strings.xml     | 1 +
 res/values-nb/strings.xml     | 1 +
 res/values-nl/strings.xml     | 1 +
 res/values-pl/strings.xml     | 1 +
 res/values-pt-rPT/strings.xml | 1 +
 res/values-pt/strings.xml     | 1 +
 res/values-rm/strings.xml     | 1 +
 res/values-ro/strings.xml     | 1 +
 res/values-ru/strings.xml     | 1 +
 res/values-sk/strings.xml     | 1 +
 res/values-sl/strings.xml     | 1 +
 res/values-sr/strings.xml     | 1 +
 res/values-sv/strings.xml     | 1 +
 res/values-sw/strings.xml     | 1 +
 res/values-th/strings.xml     | 1 +
 res/values-tl/strings.xml     | 1 +
 res/values-tr/strings.xml     | 1 +
 res/values-uk/strings.xml     | 1 +
 res/values-vi/strings.xml     | 1 +
 res/values-zh-rCN/strings.xml | 1 +
 res/values-zh-rTW/strings.xml | 1 +
 res/values-zu/strings.xml     | 1 +
 49 files changed, 49 insertions(+)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 69bb45602bb..eac4573655e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Ander netwerk..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Nog"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Outomatiese opstelling (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Wys gevorderde opsies"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi-beskermde opstelling"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS begin..."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 55c004b7e4f..aa41d74a2d6 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"ሌላ አውታረ መረብ…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"ተጨማሪ"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"በራስ ሰር ማወቀር (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"የላቁ አማራጮችን አሳይ"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"በWi-Fi የተጠበቀ መዋቅር"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS በመጀመር ላይ…"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 6d924ab65c0..e4fec3fb360 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"شبكة أخرى..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"المزيد"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"الإعداد التلقائي (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"عرض الخيارات المتقدمة"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"إعداد Wi-Fi المحمي"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"جارٍ بدء WPS…"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index ab18885d2bb..f6aa2abe745 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Іншая сетка..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Дадатковая інфармацыя"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Аўтаматычная ўсталёўка (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Паказаць дадатковыя параметры"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Абароненая ўсталёўка Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Запускаецца WPS..."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 8eab7e53269..08856ecb467 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Друга мрежа…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Още"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Авт. настройка (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Показване на разширените опции"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Защитена настройка на Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS се стартира…"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ebae51ca30d..1b35b5d15a1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Una altra xarxa…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Més"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automàtica (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostra les opcions avançades"</string>
     <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>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 4e8965e1304..92f17d279d1 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Jiná síť…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Další"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automat. nastavení (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Zobrazit pokročilé možnosti"</string>
     <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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 7736a57ff48..e58119dd244 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Andre netværk..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mere"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk konfig. (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Vis avancerede valgmuligheder"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi-beskyttet konfiguration"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starter WPS..."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7e85c799200..762f8fb9181 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -565,6 +565,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Anderes Netzwerk…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mehr"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisches Setup (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Ihr Tablet muss eine WLAN-Verbindung haben, damit die Einrichtung abgeschlossen werden kann. Nach der Einrichtung können Sie zwischen WLAN und Mobilfunk wechseln."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Erweiterte Optionen einblenden"</string>
     <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>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 924c088a377..95f41792ade 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Άλλο δίκτυο…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Περισσότερα"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Αυτόματη ρύθμιση (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Εμφάνιση σύνθετων επιλογών"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Ρύθμιση προστατευόμενου Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Έναρξη WPS…"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f3d9c7b9490..b851e9df9a6 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Other network…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"More"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatic setup (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Show advanced options"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi Protected Setup"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starting WPS…"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b8246ec314c..5f8c5d05fa4 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Otra red…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Más"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuración automática (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar las opciones avanzadas"</string>
     <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>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f994af14b2e..082ed546eb5 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Otra red…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Más"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuración automática (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Necesitas conexión Wi-Fi para completar la configuración. Una vez finalizada, podrás alternar entre Wi-Fi y conexión de datos."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar opciones avanzadas"</string>
     <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>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index b1234650144..576e20b71d4 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Muu võrk ..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Rohkem"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automaatseadistus (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Kuva täpsemad valikud"</string>
     <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>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 81bd1604b72..ef9e7190545 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"شبکه‌ای دیگر…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"بیشتر"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"تنظیم خودکار (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"نمایش گزینه‌های پیشرفته"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"نصب Wi-Fi حفاظت شده"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"راه‌اندازی WPS…"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 037f93dd945..d82a19d313d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Muu verkko..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lisää"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automaattiset aset. (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Näytä lisäasetukset"</string>
     <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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c856f5f4ada..f9400de02c6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Autre réseau…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Plus"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuration auto (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Pour terminer la configuration de votre tablette, vous devez disposer d'un accès Wi-Fi. Une fois la configuration effectuée, vous pouvez choisir d'utiliser un forfait de données pour mobile ou un réseau Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Afficher les options avancées"</string>
     <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>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d7f08da3b56..fb7b7be7e84 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"अन्‍य नेटवर्क…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"अधिक"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"स्‍वचालित सेटअप (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"उन्नत विकल्प दिखाएं"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi सुरक्षित सेटअप"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS प्रारंभ हो रहा है…"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d1d4bfe085a..2f1f7090b9e 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Ostale mreže…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Više"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. postavljanje (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Prikaži napredne opcije"</string>
     <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>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 6c00737b67e..ad8bab38107 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Másik hálózat..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Egyebek"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automat. beállítás (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Speciális beállítások megjelenítése"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"WPS"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS indítása..."</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 3b2e1efafd2..8c8c2324bbb 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Jaringan lain..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lainnya"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Penyiapan otomatis (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Tampilkan opsi lanjutan"</string>
     <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>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9e730be6f5b..b0b0f3b333a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Altra rete…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Altro"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configurazione auto (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostra opzioni avanzate"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Impostazione protetta Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Avvvio WPS..."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index cd283da29f2..6785d4076d6 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"רשת אחרת..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"עוד"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"התקנה אוטומטית (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"הצג אפשרויות מתקדמות"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"התקנה מוגנת של Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"מפעיל WPS..."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 97bab169874..ea8bc93f99f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -566,6 +566,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"他のネットワーク…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"その他"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定（WPS）"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"詳細オプションを表示"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi保護設定"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPSを開始しています…"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0595de6c427..b8398dc65b8 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"다른 네트워크…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"더보기"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"자동 설정(WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"고급 옵션 표시"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"WPS(Wi-Fi 간편 설정)"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS을 시작하는 중…"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 7c569ffc525..d8d26ca5dac 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Kitas tinklas…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Daugiau"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatinė sąranka (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Rodyti išplėstines parinktis"</string>
     <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>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 5e871a78834..49f07852460 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Cits tīkls..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Vairāk"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. iestatīšana (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Rādīt papildopcijas"</string>
     <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>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index fe74091e94d..282c3ab9f95 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Rangkaian lain..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lagi"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Persediaan automatik (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Tunjukkan pilihan terperinci"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Persediaan Terlindung Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Memulakan WPS…"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c2a83118e78..5ba137f273a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Annet nettverk"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Se mer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk konfig. (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Vis avanserte alternativer"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Beskyttet Wi-Fi-konfigurasjon (WPS)"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starter WPS …"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 3d169854b8e..5ad54ee6c7a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Ander netwerk..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Meer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. config. (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Geavanceerde opties weergeven"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Beveiligde configuratie voor wifi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS starten…"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7e15f9d80c1..e471c5853ab 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Inna sieć…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Więcej"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autokonfiguracja (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Opcje zaawansowane"</string>
     <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>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9b177954d3a..daea79c2f6d 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Outra rede..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mais"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automática (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar opções avançadas"</string>
     <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>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b876da82eda..fa75a10c755 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Outra rede..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mais"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuração automática (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar opções avançadas"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Config. protegida do Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando WPS…"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 701e716a25e..3477218872f 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -839,6 +839,7 @@
     <skip />
     <!-- no translation found for wifi_setup_wps (8128702488486283957) -->
     <skip />
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <!-- no translation found for wifi_show_advanced (1793703023711426246) -->
     <skip />
     <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 799d2741def..fb92d7b4806 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Altă reţea…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mai multe"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automată (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Afişaţi opţiunile avansate"</string>
     <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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 99b92070620..6870a1ce952 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Другие сети…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Ещё"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Автонастройка (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Дополнительно"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Безопасная настройка Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Запуск WPS…"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 73f46ef794a..80628d399cf 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Iná sieť..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Viac"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatické nastavenie (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Zobraziť rozšírené možnosti"</string>
     <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>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 891c10f5e8b..8bcc0e9e940 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Drugo omrežje ..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Več"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Samodej. nastavitev (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Prikaz dodatnih možnosti"</string>
     <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>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 46ee9df1c15..7ae8b992d30 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Друга мрежа..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Још"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Аутоматско подешавање (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Прикажи напредне опције"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Заштићено подешавање Wi-Fi-ја"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Покретање WPS-а..."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index df55c34a9eb..880fbf86bf0 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Annat nätverk …"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk installation (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Visa avancerade alternativ"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Skyddad Wi-Fi-konfiguration"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Startar WPS ..."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index c5de2f1c5d0..6ad01350e60 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -556,6 +556,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Mtandao mwingine..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Zaidi"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Usanidi otomatiki (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Onyesha chaguo za kindani"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Usanidi Uliolindwa na Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Inaanzisha WPS ..."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 9986cfdbc62..d8d52040573 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"เครือข่ายอื่น…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"เพิ่มเติม"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"การตั้งค่าอัตโนมัติ (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"แสดงตัวเลือกขั้นสูง"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"การตั้งค่าการป้องกัน WiFi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"กำลังเริ่มต้น WPS…"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c6c0bfea775..26bf4b4ca9d 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Iba pang network..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Higit pa"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Awtomatikong setup (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Ipakita ang mga advanced na pagpipilian"</string>
     <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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 56f1d80f2a2..5aa73c4ae15 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Diğer ağ…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Diğer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Otomatik kurulum (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Gelişmiş seçenekleri göster"</string>
     <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>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index bd1240e8576..c2bd8215c84 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Інша мережа…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Більше"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Авто-налаштування (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Показати розширені параметри"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Налаштування захищеної мережі Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Запуск WPS..."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 15491c7288f..113cbe75fbb 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Mạng khác…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Thêm"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Thiết lập tự động (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Hiển thị tùy chọn nâng cao"</string>
     <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>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 9c47743dea6..b817a3045d4 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"其他网络…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自动设置 (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"显示高级选项"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi 保护设置"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"正在启动 WPS..."</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 04e0c027438..3cfc9d00af2 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"其他網路…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定 (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"顯示進階選項"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"WiFi 保護設定"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"正在啟動 WPS…"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 2d21f24f788..9d56ffe4c4a 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -564,6 +564,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Enye inethiwekhi…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Okunye"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Ukusetha okuzenzakalelayo (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Bonisa okukhethwa kukho okuseqophelweni"</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>

From 62abddace39aaefecaac10779a6ce2a213b7156c Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Tue, 23 Oct 2012 13:25:55 -0700
Subject: [PATCH 4/4] Remove blank translation string from en-GB, so it can
 show English.

Change-Id: I124abc4113f38b8fbd3ff164af5f0d47970f5471
---
 res/values-en-rGB/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b851e9df9a6..ffd87e5aed7 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -564,7 +564,8 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Other network…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"More"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatic setup (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <!-- no translation found for wifi_required_info_text (9014073093293520112) -->
+    <skip/>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Show advanced options"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi Protected Setup"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starting WPS…"</string>