Merge "wifi-display: use new getDisplays() method of WifiDisplayStatus"
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index a759646..523730d 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -514,8 +514,7 @@
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"Падключэнне"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"Падключана"</string>
<string name="wifi_display_status_available" msgid="1924167525172207067">"Даступна"</string>
- <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
- <skip />
+ <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Выкарыстоўваецца"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"Налады экрана"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Адключыцца?"</string>
<string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Будзе завершана вашай сувящь з прыладай :<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
@@ -1402,14 +1401,10 @@
<string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi працуе"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Планшэт"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"Тэлефон"</string>
- <!-- no translation found for usage_type_data_send (3875198715268918671) -->
- <skip />
- <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
- <skip />
+ <string name="usage_type_data_send" msgid="3875198715268918671">"Мабільныя дадзеныя адпраўлены"</string>
+ <string name="usage_type_data_recv" msgid="6694951443404021754">"Атрыманы мабільныя дадзеныя"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Дадзеныя ў сетцы Wi-Fi адпраўлены"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Атрыманы дадзеныя ў сетцы Wi-Fi"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"Аўдыё"</string>
<string name="usage_type_video" msgid="4295357792078579944">"Відэа"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Час працы"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 4298941..2798b82 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -514,8 +514,7 @@
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"Установява се връзка"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"Установена е връзка"</string>
<string name="wifi_display_status_available" msgid="1924167525172207067">"Налице"</string>
- <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
- <skip />
+ <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Използва се"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"Настройки за дисплея"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Да се изключи ли?"</string>
<string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Това ще прекрати връзката ви със:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
@@ -1402,14 +1401,10 @@
<string name="usage_type_wifi_running" msgid="3134357198266380400">"Работещ Wi‑Fi"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Таблет"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"Телефон"</string>
- <!-- no translation found for usage_type_data_send (3875198715268918671) -->
- <skip />
- <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
- <skip />
+ <string name="usage_type_data_send" msgid="3875198715268918671">"Мобилните данни са изпратени"</string>
+ <string name="usage_type_data_recv" msgid="6694951443404021754">"Мобилните данни са получени"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Данните през Wi-Fi са изпратени"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Данните през Wi-Fi са получени"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"Аудио"</string>
<string name="usage_type_video" msgid="4295357792078579944">"Видео"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Продължителност на включване"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 52b1ea0..8ec6219 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1403,8 +1403,8 @@
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telèfon"</string>
<string name="usage_type_data_send" msgid="3875198715268918671">"S\'han enviat les dades mòbils"</string>
<string name="usage_type_data_recv" msgid="6694951443404021754">"S\'han rebut les dades mòbils"</string>
- <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"S\'han enviat les dades per Wi‑Fi"</string>
- <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"S\'han rebut les dades per Wi‑Fi"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"S\'han enviat les dades Wi‑Fi"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"S\'han rebut les dades Wi‑Fi"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"Àudio"</string>
<string name="usage_type_video" msgid="4295357792078579944">"Vídeo"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Temps d\'activació"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7674c11..d933fdd 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -514,8 +514,7 @@
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"Připojování"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"Připojené"</string>
<string name="wifi_display_status_available" msgid="1924167525172207067">"Dostupné"</string>
- <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
- <skip />
+ <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Používá se"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"Nastavení displeje"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Odpojit?"</string>
<string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Tímto ukončíte připojení k zařízení:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
@@ -1402,14 +1401,10 @@
<string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi je aktivní"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
- <!-- no translation found for usage_type_data_send (3875198715268918671) -->
- <skip />
- <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
- <skip />
+ <string name="usage_type_data_send" msgid="3875198715268918671">"Odeslané mobilní datové přenosy"</string>
+ <string name="usage_type_data_recv" msgid="6694951443404021754">"Přijaté mobilní datové přenosy"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Odeslané datové přenosy Wi‑Fi"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Přijaté datové přenosy Wi‑Fi"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"Zvuk"</string>
<string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Doba zapnutí"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5567ada..7c5c83c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -514,8 +514,7 @@
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"Tilslutter"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"Tilsluttet"</string>
<string name="wifi_display_status_available" msgid="1924167525172207067">"Tilgængelig"</string>
- <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
- <skip />
+ <string name="wifi_display_status_in_use" msgid="8556830875615434792">"I brug"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"Skærmindstillinger"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Vil du afbryde forbindelsen?"</string>
<string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Dette vil afslutte din forbindelse til:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
@@ -1402,14 +1401,10 @@
<string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi aktiv"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
- <!-- no translation found for usage_type_data_send (3875198715268918671) -->
- <skip />
- <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
- <skip />
+ <string name="usage_type_data_send" msgid="3875198715268918671">"Mobildata blev sendt"</string>
+ <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobildata blev modtaget"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wi-Fi-data blev sendt"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wi-Fi-data blev modtaget"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"Lyd"</string>
<string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Tid til"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index eaf20bf..9c58100 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -514,8 +514,7 @@
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectada"</string>
<string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
- <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
- <skip />
+ <string name="wifi_display_status_in_use" msgid="8556830875615434792">"En uso"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"Configuración de visualización"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"¿Desconectar?"</string>
<string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Finalizará tu conexión con<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>."</string>
@@ -1402,14 +1401,10 @@
<string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi en funcionamiento"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"Teléfono"</string>
- <!-- no translation found for usage_type_data_send (3875198715268918671) -->
- <skip />
- <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
- <skip />
+ <string name="usage_type_data_send" msgid="3875198715268918671">"Datos móviles enviados"</string>
+ <string name="usage_type_data_recv" msgid="6694951443404021754">"Datos móviles recibidos"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Datos Wi‑Fi enviados"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Datos Wi‑Fi recibidos"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
<string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Tiempo de activación"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 8eab5fd..ff284c6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1403,8 +1403,8 @@
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"تلفن"</string>
<string name="usage_type_data_send" msgid="3875198715268918671">"دادههای ارسالی تلفن همراه"</string>
<string name="usage_type_data_recv" msgid="6694951443404021754">"دادههای دریافتی تلفن همراه"</string>
- <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"دادههای ارسالی Wi-Fi"</string>
- <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"دادههای دریافتی Wi-Fi"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"دادههای ارسالی Wi-Fi"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"دادههای دریافتی Wi-Fi"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"صوتی"</string>
<string name="usage_type_video" msgid="4295357792078579944">"ویدئو"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"زمان روشن"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index b1d349a..7bb73f8 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -514,8 +514,7 @@
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"Yhdistetään"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"Yhdistetty"</string>
<string name="wifi_display_status_available" msgid="1924167525172207067">"Käytettävissä"</string>
- <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
- <skip />
+ <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Käytössä"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"Näyttöasetukset"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Katkaistaanko yhteys?"</string>
<string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Katkaisee yhteyden laitteeseen:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
@@ -1402,14 +1401,10 @@
<string name="usage_type_wifi_running" msgid="3134357198266380400">"Wifi on käytössä"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"Puhelin"</string>
- <!-- no translation found for usage_type_data_send (3875198715268918671) -->
- <skip />
- <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
- <skip />
+ <string name="usage_type_data_send" msgid="3875198715268918671">"Lähetetty mobiilitiedonsiirto"</string>
+ <string name="usage_type_data_recv" msgid="6694951443404021754">"Vastaanotet. mobiilitiedonsiirto"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Lähetetty wifi-tiedonsiirto"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Vastaanotettu wifi-tiedonsiirto"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"Ääni"</string>
<string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Käytössäoloaika"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5a2ecfd..cbea160 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -514,8 +514,7 @@
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"Connexion en cours…"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"Connecté"</string>
<string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
- <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
- <skip />
+ <string name="wifi_display_status_in_use" msgid="8556830875615434792">"En cours d\'utilisation"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"Paramètres d\'affichage"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Voulez-vous vraiment vous déconnecter ?"</string>
<string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Cette opération va mettre fin à votre connexion avec :<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
@@ -1402,14 +1401,10 @@
<string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi actif"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablette"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"Téléphone"</string>
- <!-- no translation found for usage_type_data_send (3875198715268918671) -->
- <skip />
- <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
- <skip />
+ <string name="usage_type_data_send" msgid="3875198715268918671">"Données mobiles envoyées"</string>
+ <string name="usage_type_data_recv" msgid="6694951443404021754">"Données mobiles reçues"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Données Wi‑Fi envoyées"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Données Wi‑Fi reçues"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
<string name="usage_type_video" msgid="4295357792078579944">"Vidéo"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Durée d\'activation"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 2f7c415..e56c35b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -514,8 +514,7 @@
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"연결 중"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"연결됨"</string>
<string name="wifi_display_status_available" msgid="1924167525172207067">"사용 가능"</string>
- <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
- <skip />
+ <string name="wifi_display_status_in_use" msgid="8556830875615434792">"사용 중"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"디스플레이 설정"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"연결을 해제하시겠습니까?"</string>
<string name="wifi_display_disconnect_text" msgid="4824860802264489088">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 연결이 끊어집니다."</string>
@@ -982,7 +981,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"모바일 네트워크"</string>
<string name="location_title" msgid="1029961368397484576">"사용자 위치"</string>
<string name="location_network_based" msgid="9134175479520582215">"Wi-Fi 및 모바일 네트워크 위치"</string>
- <string name="location_neighborhood_level" msgid="5626515380188353712">"사용자의 위치를 빠르게 예측하도록 앱에서 Google의 위치 서비스를 사용합니다. 익명의 위치 데이터가 수집되어 Google로 전송됩니다."</string>
+ <string name="location_neighborhood_level" msgid="5626515380188353712">"사용자의 위치를 빠르게 예측하도록 앱에서 Google의 위치 서비스를 사용합니다. 익명의 위치 정보가 수집되어 Google로 전송됩니다."</string>
<string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi에서 측정된 위치"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS 위성"</string>
<string name="location_street_level" product="tablet" msgid="1669562198260860802">"앱이 사용자 태블릿의 GPS를 사용하여 사용자 위치를 파악하도록 함"</string>
@@ -1402,14 +1401,10 @@
<string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi 실행 중"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"태블릿"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"휴대전화"</string>
- <!-- no translation found for usage_type_data_send (3875198715268918671) -->
- <skip />
- <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
- <skip />
+ <string name="usage_type_data_send" msgid="3875198715268918671">"모바일 데이터 전송"</string>
+ <string name="usage_type_data_recv" msgid="6694951443404021754">"모바일 데이터 수신"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wi‑Fi 데이터 전송"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wi‑Fi 데이터 수신"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"오디오"</string>
<string name="usage_type_video" msgid="4295357792078579944">"동영상"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"사용 시간"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index c598b1c..0ad8d08 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -514,8 +514,7 @@
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"Menyambung"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"Bersambung"</string>
<string name="wifi_display_status_available" msgid="1924167525172207067">"Tersedia"</string>
- <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
- <skip />
+ <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Sedang digunakan"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"Tetapan paparan"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Putuskan sambungan WiFi?"</string>
<string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Ini akan menamatkan sambungan anda dengan:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
@@ -1402,14 +1401,10 @@
<string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi berjalan"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
- <!-- no translation found for usage_type_data_send (3875198715268918671) -->
- <skip />
- <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
- <skip />
+ <string name="usage_type_data_send" msgid="3875198715268918671">"Data mudah alih yang dihantar"</string>
+ <string name="usage_type_data_recv" msgid="6694951443404021754">"Data mudah alih yang diterima"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Data Wi-Fi yang dihantar"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Data Wi-Fi yang diterima"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
<string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Masa hidup"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e646147..1257123 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -514,8 +514,7 @@
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"A ligar"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"Ligado"</string>
<string name="wifi_display_status_available" msgid="1924167525172207067">"Disponível"</string>
- <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
- <skip />
+ <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Em utilização"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"Definições de visualização"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Desligar?"</string>
<string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Isto terminará a sua ligação com:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
@@ -1402,14 +1401,10 @@
<string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi em execução"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefone"</string>
- <!-- no translation found for usage_type_data_send (3875198715268918671) -->
- <skip />
- <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
- <skip />
+ <string name="usage_type_data_send" msgid="3875198715268918671">"Dados móveis enviados"</string>
+ <string name="usage_type_data_recv" msgid="6694951443404021754">"Dados móveis recebidos"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Dados Wi-Fi enviados"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Dados Wi-Fi recebidos"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"Áudio"</string>
<string name="usage_type_video" msgid="4295357792078579944">"Vídeo"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Hora activada"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 287567a..a785bb6 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -514,8 +514,7 @@
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"Se conectează"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectat"</string>
<string name="wifi_display_status_available" msgid="1924167525172207067">"Disponibil"</string>
- <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
- <skip />
+ <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Se utilizează"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"Setări de afişare"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Deconectaţi?"</string>
<string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Această acţiune va încheia conexiunea cu:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
@@ -1403,14 +1402,10 @@
<string name="usage_type_wifi_running" msgid="3134357198266380400">"Funcționare Wi-Fi"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tabletă"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
- <!-- no translation found for usage_type_data_send (3875198715268918671) -->
- <skip />
- <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
- <skip />
+ <string name="usage_type_data_send" msgid="3875198715268918671">"Date mobile trimise"</string>
+ <string name="usage_type_data_recv" msgid="6694951443404021754">"Date mobile primite"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Date Wi-Fi trimise"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Date Wi-Fi primite"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
<string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Durată de activitate"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f2f7857..7f3101f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -514,8 +514,7 @@
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"Подключение…"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"Подключен"</string>
<string name="wifi_display_status_available" msgid="1924167525172207067">"Доступен"</string>
- <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
- <skip />
+ <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Используется"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"Настройки экрана"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Отключиться?"</string>
<string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Произойдет разъединение с устройством<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
@@ -1402,14 +1401,10 @@
<string name="usage_type_wifi_running" msgid="3134357198266380400">"Модуль Wi-Fi включен"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Планшетный ПК"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"Телефон"</string>
- <!-- no translation found for usage_type_data_send (3875198715268918671) -->
- <skip />
- <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
- <skip />
+ <string name="usage_type_data_send" msgid="3875198715268918671">"Данные отправлены"</string>
+ <string name="usage_type_data_recv" msgid="6694951443404021754">"Данные получены"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Данные отправлены по сети Wi‑Fi"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Данные получены по сети Wi‑Fi"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"Аудио"</string>
<string name="usage_type_video" msgid="4295357792078579944">"Видео"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Время работы"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index b4142d2..d6101c7 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -506,8 +506,7 @@
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"Inaunganisha"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"Vimeunganishwa"</string>
<string name="wifi_display_status_available" msgid="1924167525172207067">"Inapatikana"</string>
- <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
- <skip />
+ <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Vinavyotumika"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"Onyesha mipangilio"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Kata muunganisho?"</string>
<string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Hii itaukata muunganisho wako kwa:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
@@ -1394,14 +1393,10 @@
<string name="usage_type_wifi_running" msgid="3134357198266380400">"Inaendesha Wi-Fi"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Kompyuta ndogo"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"Simu"</string>
- <!-- no translation found for usage_type_data_send (3875198715268918671) -->
- <skip />
- <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
- <skip />
+ <string name="usage_type_data_send" msgid="3875198715268918671">"Daya ya kifaa cha mkononi imetumwa"</string>
+ <string name="usage_type_data_recv" msgid="6694951443404021754">"Data ya kifaa cha mkononi imepokelewa"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Data ya Wi‑Fi imetumwa"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Data ya Wi‑Fi imepokelewa"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"Kusikika"</string>
<string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Washa saa"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 083df8b..a70285a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -514,8 +514,7 @@
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"Bağlanılıyor"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"Bağlandı"</string>
<string name="wifi_display_status_available" msgid="1924167525172207067">"Kullanılabilir"</string>
- <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
- <skip />
+ <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Kullanımda"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"Ekran ayarları"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Bağlantı kesilsin mi?"</string>
<string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Şu cihazla bağlantınız kesilecek:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
@@ -1402,14 +1401,10 @@
<string name="usage_type_wifi_running" msgid="3134357198266380400">"Kablosuz çalışıyor"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
- <!-- no translation found for usage_type_data_send (3875198715268918671) -->
- <skip />
- <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
- <skip />
+ <string name="usage_type_data_send" msgid="3875198715268918671">"Mobil veri gönderildi"</string>
+ <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobil veri alındı"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Kablosuz verisi gönderildi"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Kablosuz verisi alındı"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"Ses"</string>
<string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Açma zamanı"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 81ac520..29c1d9e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -514,8 +514,7 @@
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"正在连接"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"已连接"</string>
<string name="wifi_display_status_available" msgid="1924167525172207067">"可用"</string>
- <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
- <skip />
+ <string name="wifi_display_status_in_use" msgid="8556830875615434792">"正在使用中"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"显示设备设置"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"是否断开连接？"</string>
<string name="wifi_display_disconnect_text" msgid="4824860802264489088">"此操作将会断开您与以下设备的连接：<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
@@ -1402,14 +1401,10 @@
<string name="usage_type_wifi_running" msgid="3134357198266380400">"WLAN 正在运行"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"平板电脑"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"通话"</string>
- <!-- no translation found for usage_type_data_send (3875198715268918671) -->
- <skip />
- <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
- <skip />
+ <string name="usage_type_data_send" msgid="3875198715268918671">"已发送的移动数据"</string>
+ <string name="usage_type_data_recv" msgid="6694951443404021754">"已接收的移动数据"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"已发送的 WLAN 数据"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"已接收的 WLAN 数据"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"音频"</string>
<string name="usage_type_video" msgid="4295357792078579944">"视频"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"已运行时间"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index bed8ac6..a5724e3 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -514,8 +514,7 @@
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"Iyaxhuma"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"Ixhunyiwe"</string>
<string name="wifi_display_status_available" msgid="1924167525172207067">"Kuyatholakala"</string>
- <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
- <skip />
+ <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Kuyasebenza"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"Bonisa izilungiselelo"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Nqamula?"</string>
<string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Lokhu kuzophelisa uxhumano nge:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
@@ -1409,14 +1408,10 @@
<string name="usage_type_wifi_running" msgid="3134357198266380400">"I-Wi-Fi iyasebenza"</string>
<string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Ithebhulethi"</string>
<string name="usage_type_phone" product="default" msgid="9108247984998041853">"Ifoni"</string>
- <!-- no translation found for usage_type_data_send (3875198715268918671) -->
- <skip />
- <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
- <skip />
- <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
- <skip />
+ <string name="usage_type_data_send" msgid="3875198715268918671">"Idatha yeselula ethunyelwe"</string>
+ <string name="usage_type_data_recv" msgid="6694951443404021754">"Idatha yeselula etholakele"</string>
+ <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Idatha ye-Wi‑Fi ethunyelwe"</string>
+ <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Idatha ye-Wi‑Fi etholakele"</string>
<string name="usage_type_audio" msgid="6957269406840886290">"Umsindo"</string>
<string name="usage_type_video" msgid="4295357792078579944">"Ividiyo"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Isikhathi sivuliwe"</string>
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
index 3251216..5efe117 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
@@ -64,7 +64,9 @@
final String word = args.getString(EXTRA_WORD);
if (null != word) {
mWordEditText.setText(word);
- mWordEditText.setSelection(word.length());
+ // Use getText in case the edit text modified the text we set. This happens when
+ // it's too long to be edited.
+ mWordEditText.setSelection(mWordEditText.getText().length());
}
final String shortcut = args.getString(EXTRA_SHORTCUT);
if (null != shortcut && null != mShortcutEditText) {