Merge "Remove wifi scan-always dialog." into jb-mr2-dev
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index d318582..2b18cbd 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -583,7 +583,7 @@
<string name="wifi_wps_setup_title" msgid="8207552222481570175">"በWi-Fi የተጠበቀ ውቅር"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS በመጀመር ላይ…"</string>
<string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"በራውተርዎ ላይ ያለውን በWi-Fi የሚጠበቀው የማወቀሪያ አዝራርን ይጫኑ። «WPS» ሊባል ይችላል ወይም ይሄንን ምልክት ሊያካትት ይችላል፦"</string>
- <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"በገመድ አልባ ራውተርዎ ላይ ፒን <xliff:g id="NUMBER">%1$s</xliff:g> ያስገቡ። ማዋቀሩ እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊወስድ ይችላል።"</string>
+ <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"በWi‑Fi ራውተርዎ ላይ ፒን <xliff:g id="NUMBER">%1$s</xliff:g> ያስገቡ። ማዋቀሩ እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊወስድ ይችላል።"</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS ተሳክቷል። ከአውታረ መረቡ ጋር በመገናኘት ላይ…"</string>
<string name="wifi_wps_connected" msgid="7153432445748931183">"ከWi-Fi አውታረ መረብ <xliff:g id="NETWORK_NAME">%s</xliff:g> ጋር ተገናኝቷል"</string>
<string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS አስቀድሞ በሂድት ላይ ነውና እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊፈጅ ይችላል"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 62d9cbf..40b80ca 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -979,7 +979,7 @@
<string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
<string name="network_settings_title" msgid="7967552516440151852">"Redes móviles"</string>
<string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
- <string name="location_network_based" msgid="9134175479520582215">"Ubicación de WiFi y red móvil"</string>
+ <string name="location_network_based" msgid="9134175479520582215">"Ubicación de Wi-Fi y red móvil"</string>
<string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación (se enviarán datos anónimos a Google)"</string>
<string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicación determinada por Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Satélites de GPS"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index c387cfd..86fcf31 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -309,8 +309,8 @@
<string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Taip teks untuk dipaparkan pada skrin kunci"</string>
<string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Tunjukkan maklumat pengguna pada skrin kunci"</string>
<string name="user_info_settings_title" msgid="1195015434996724736">"Maklumat pengguna"</string>
- <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Tunjukkan info profil pada skrin kunci"</string>
- <string name="profile_info_settings_title" msgid="3518603215935346604">"Info profil"</string>
+ <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Tunjukkan maklumat profil pada skrin kunci"</string>
+ <string name="profile_info_settings_title" msgid="3518603215935346604">"Maklumat profil"</string>
<string name="location_settings_title" msgid="4483843407328665068">"Akses lokasi"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Keselamatan"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Tetapkan Lokasi Saya, buka kunci skrin, kunci kad SIM, kunci storan bukti kelayakan"</string>
@@ -574,7 +574,7 @@
<string name="wifi_menu_modify" msgid="2068554918652440105">"Ubah suai"</string>
<string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Untuk melihat rangkaian yang tersedia, hidupkan Wi-Fi."</string>
<string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Mencari rangkaian Wi-Fi..."</string>
- <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Anda tidak mempunyai kebenaran untuk menukar rangkaian Wi-Fi."</string>
+ <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Anda tiada kebenaran untuk menukar rangkaian Wi-Fi."</string>
<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>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 6dc68b7..060c465 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -266,7 +266,7 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Izilungiselelo"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Isinqamuleli sezilungiselelo"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Imodi yendiza"</string>
- <string name="radio_controls_title" msgid="6889937359495515769">"Okungaphezulu…"</string>
+ <string name="radio_controls_title" msgid="6889937359495515769">"Okuningi…"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Amanethiwekhi; nokungenantambo"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Phatha i-Wi-Fi, i-Bluetooth, imodi yendiza, amanethiwekhi eselula; nama-VPN"</string>
<string name="roaming" msgid="3596055926335478572">"Ukuzulazula kwedatha"</string>
