Merge "Cluster apps by user in Data Usage."
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 3735f0e..de650c0 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Gestoor"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Gedeaktiveer"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Swak internetverbinding vermy"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Die netwerk is weens \'n swak verbinding vermy. Skakel hierdie gedrag af in die Instellings- en Wi-Fi-skerm, Gevorderde kieslysitem."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Stawingsprobleem"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Nie binne ontvangs nie"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS beskikbaar"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobiele netwerke"</string>
<string name="location_title" msgid="1029961368397484576">"My ligging"</string>
<string name="location_network_based" msgid="5569673665032992664">"Google se liggingsdiens"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Laat programme data vanaf bronne soos Wi-Fi en mobiele netwerke gebruik om jou benaderde ligging te bepaal"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Laat toe dat anonieme ligigngsdata na Google gestuur word. Laat ook toegelate programme toe om data van bronne soos Wi-Fi en mobiele netwerke te gebruik om jou benaderde ligging te bepaal."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Ligging deur Wi-Fi vasgestel"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS-satelliete"</string>
<string name="location_street_level" msgid="4244496898967415234">"Laat programme GPS gebruik om jou ligging presies vas te stel"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 29b4022..568f200 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"ተቀምጧል"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"ተሰነክሏል"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"ደካማ የበየነመረብ ግንኙነት አስወግድ"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"በደካማ ግንኙነት የተነሳ አውታረመረቡ እንዳይቀርብ ተደርጓል:: ይህን ባህሪ ከቅንጅቶች > Wi-Fi ማያ ገጽ የላቀ ምናሌ ንጥል ላይ አጥፋው::"</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"የማረጋገጫ ችግር"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"በክልል ውስጥ የለም"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS አለ"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"የተንቀሳቃሽ ስልክአውታረመረብ"</string>
<string name="location_title" msgid="1029961368397484576">"የእኔ ሥፍራ"</string>
<string name="location_network_based" msgid="5569673665032992664">"የGoogle ሥፍራ አገልግሎት"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"የተጠጋጋ ሥፍራህን ለመወሰን እንደ Wi-Fi እና የተንቀሳቃሽ ስልክ አውታረ መረቦች ያሉትን የውሂብ ምንጮች ትግበራዎች ተጠቀምባቸው።"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"ስም አልባ የአካባቢ ውሂብ ወደ Google እንዲላኩ ፍቀድ። የተፈቀደላቸው መተግበሪያዎች አካባቢህን በግምት እንዲያውቁትም ከአንደ ገመድ አልባ እና የተንቀሳቃሽ ስልክ አውታረ መረቦች ያሉ ምንጮች ውሂብ እንዲጠቀሙ ፍቀድላቸው።"</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"ሥፍራ በWi-Fi ይወሰናል"</string>
<string name="location_gps" msgid="8392461023569708478">"የGPS ሳተላይቶች"</string>
<string name="location_street_level" msgid="4244496898967415234">"ትግበራዎች የእርስዎን ስፍራ በትክክል እንዲያሳዩ GPS ይጠቀሙ።"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1812ad4..dbd7fbe 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"تم الحفظ"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"معطلة"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"تم تجنب اتصال الإنترنت الضعيف"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"تم تجاهل الشبكة بسبب سوء الاتصال. يمكنك إيقاف هذا السلوك من خلال شاشة الإعدادات > Wi-Fi، عنصر قائمة \"إعدادات متقدمة\"."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"حدثت مشكلة في المصادقة"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"ليست في النطاق"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS متاح"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"شبكات الجوال"</string>
<string name="location_title" msgid="1029961368397484576">"موقعي"</string>
<string name="location_network_based" msgid="5569673665032992664">"خدمة الموقع من Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"السماح للتطبيقات باستخدام بيانات من مصادر مثل شبكة Wi-Fi وشبكات الجوال لتحديد موقعك التقريبي"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"السماح بإرسال بيانات موقع مجهولة المصدر إلى Google. والسماح أيضًا للتطبيقات المسموح بها باستخدام البيانات من موارد مثل شبكات Wi-Fi وشبكات الجوال لتحديد الموقع التقريبي."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"الموقع الذي تم تحديده بواسطة Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"الأقمار الصناعية لنظام GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"السماح للتطبيقات باستخدام GPS لتحديد موقعك"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index a9e8f6c..e360c0c 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Захавана"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Адключаная"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Пазбегнута дрэннае злучэнне"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Сеткi ўдалося пазбегнуць з-за дрэннай сувязі. Выключыце гэты рэжым, перайшоўшы ў налады (раздзел \"Экран Wi-Fi\", \"Пашыраныя налады\")."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Праблема аўтэнтыфікацыі"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Не ў зоне дасягальнасці"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS даступная"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Мабільныя сеткі"</string>
<string name="location_title" msgid="1029961368397484576">"Маё месцазнаходжанне"</string>
<string name="location_network_based" msgid="5569673665032992664">"Служба вызн. месцазнах. Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Дазваляе прыкладанням выкарыстоўваць дадзеныя з такіх крыніц, як Wi-Fi і мабільныя сеткі, каб вызначыць ваша прыблізнае месцазнаходжанне"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Дазволіць адпраўляць ананiмныя дадзеныя ў Google. Таксама дазваляе пэўным прыкладанням выкарыстоўваць дадзеныя з такіх крыніц, як Wi-Fi і мабільныя сеткі, каб вызначыць прыблізнае месцазнаходжанне."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Месца вызначаецца праз Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS спадарожнікі"</string>
<string name="location_street_level" msgid="4244496898967415234">"Дазволіць праграмам выкарыстоўваць GPS, каб дакладна вызначыць ваша месцазнаходжанне"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 9787fb4..6aaff67 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Запазено"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Деактивирани"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Избегната е лоша връзка с интернет"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Мрежата бе избегната поради лоша връзка. Изключете този режим на работа от „Настройки“ > „Екран за Wi-Fi“, елемента от менюто „Разширени“."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблем при удостоверяването"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Извън обхват"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Налице е WPS"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Мобилни мрежи"</string>
<string name="location_title" msgid="1029961368397484576">"Моето местоположение"</string>
<string name="location_network_based" msgid="5569673665032992664">"Услуга на Google за местопол."</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Приложенията да използват данни от източници като Wi-Fi и мобилни мрежи, за да определят приблизителното ми местоположение"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Разрешаване на изпращането на анонимни данни за местоп. до Google. Приложенията с разрешение да използват данни от изт. като Wi-Fi и моб. мрежи за опр. на прибл. ви местоп."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Местоположението се определя чрез Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Спътници на GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Разрешавам на приложенията да използват GPS, за да посочат местоположението ми"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 0e65693..12115df 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Desat"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Desactivada"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"S\'ha evitat una mala connexió a Internet"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"S\'ha evitat la xarxa perquè la connexió no era bona. Per desactivar això, vés a la pantalla Configuració > Wi-Fi, a l\'element del menú Avançat."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema d\'autenticació"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Fora de l\'abast"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Xarxes mòbils"</string>
<string name="location_title" msgid="1029961368397484576">"La meva ubicació"</string>
<string name="location_network_based" msgid="5569673665032992664">"Servei d\'ubicació de Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Permet que les aplicacions utilitzin dades de fonts com ara Wi-Fi i xarxes de telefonia mòbil per determinar la teva ubicació aproximada"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Permet que s\'enviïn dades d\'ubicació anònimes a Google. Permet també que les aplicacions que tinguin permís facin servir dades d\'orígens com ara les xarxes de Wi-Fi i mòbils per determinar la ubicació aproximada."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Ubicació determinada per Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Satèl·lits GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Permet que les aplicacions usin GPS per determinar la teva ubicació"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index efb8bca..d4a875e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Uloženo"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Vypnuto"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Bylo zabráněno slabému připojení"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Síť nebyla použita z důvodu špatného připojení. Toto nastavení můžete vypnout na obrazovce Nastavení v části Wi-Fi, položka nabídky Pokročilé."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problém s ověřením"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Mimo dosah"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozici"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobilní sítě"</string>
<string name="location_title" msgid="1029961368397484576">"Moje poloha"</string>
<string name="location_network_based" msgid="5569673665032992664">"Určování polohy Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Povolit aplikacím používat k určení vaší přibližné polohy údaje ze zdrojů, jako jsou sítě Wi-Fi nebo mobilní sítě"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Dovoluje odesílat anonymní data o poloze do Googlu. Také umožňuje povoleným aplikacím, aby k určení vaší přibližné polohy využívaly data ze zdrojů, jako jsou sítě Wi-Fi a mobilní sítě."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Poloha určená sítí Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Satelity GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Povolit aplikacím určit vaši přesnou polohu pomocí systému GPS"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b595506..305efc1 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Gemt"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktiveret"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Dårlig internetforbindelse er undgået"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Netværket blev undgået på grund af dårlig forbindelse. Deaktiver dette i Indstillinger > Wi-Fi-skærm, menupunktet Avanceret."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem med godkendelse"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Ikke inden for rækkevidde"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS er tilgængelig"</string>
@@ -767,8 +765,7 @@
<string name="sd_ejecting_title" msgid="8824572198034365468">"Demontering"</string>
<string name="sd_ejecting_summary" msgid="2028753069184908491">"Demontering i gang"</string>
<string name="storage_menu_usb" msgid="5708207885333243384">"USB-tilslutning til computer"</string>
- <!-- no translation found for storage_menu_enforce_read_external (1056191049645563747) -->
- <skip />
+ <string name="storage_menu_enforce_read_external" msgid="1056191049645563747">"Håndhæv ekstern læsning"</string>
<string name="storage_title_usb" msgid="679612779321689418">"USB-tilslutning til computer"</string>
<string name="usb_connection_category" msgid="7805945595165422882">"Tilslut som"</string>
<string name="usb_mtp_title" msgid="3399663424394065964">"Medieenhed (MTP)"</string>
@@ -882,7 +879,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobilnetværk"</string>
<string name="location_title" msgid="1029961368397484576">"Min placering"</string>
<string name="location_network_based" msgid="5569673665032992664">"Googles placeringstjeneste"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Lad apps bruge data fra kilder som Wi-Fi og mobilnetværk til at bestemme din omtrentlige placering"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Tillad, at anonyme placeringsdata sendes til Google. Tillad også, at udvalgte apps anvender data fra kilder såsom Wi-Fi- og mobilnetværk til at bestemme din omtrentlige placering."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Placeringen fastlægges af Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS-satellitter"</string>
<string name="location_street_level" msgid="4244496898967415234">"Lad apps bruge GPS til at afgøre din placering"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4cb7a06..0caa3d3 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -547,8 +547,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Gespeichert"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktiviert"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Schlechte Verbindung"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Das Netzwerk wurde aufgrund der schlechten Verbindung umgangen. Sie können dieses Verhalten im WLAN-Bildschirm unter \"Einstellungen\" im Menü \"Erweitert\" deaktivieren."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authentifizierungsproblem"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Nicht in Reichweite"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS verfügbar"</string>
@@ -883,7 +881,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobilfunknetze"</string>
<string name="location_title" msgid="1029961368397484576">"Mein Standort"</string>
<string name="location_network_based" msgid="5569673665032992664">"Standortdienst von Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Zulassen, dass Apps WLAN und Mobilfunknetze für die Bestimmung meines ungefähren Standorts verwenden"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Anonyme Standortdaten dürfen an Google gesendet werden. Außerdem können bestimmte Apps Daten aus Quellen wie WLAN und Mobilfunknetzen für die Ermittlung des ungefähren Standorts nutzen."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Standort per WLAN bestimmt"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS-Satelliten"</string>
<string name="location_street_level" msgid="4244496898967415234">"Apps dürfen meinen Standort mithilfe von GPS bestimmen."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3ff8012..3f1bfb4 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Αποθηκευμένο"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Απενεργοποιημένο"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Αποφυγή κακής σύνδεσης στο Διαδίκτυο"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Το δίκτυο δεν χρησιμοποιήθηκε λόγω κακής σύνδεσης. Απενεργοποιήστε αυτήν τη ρύθμιση από το στοιχείο Ρυθμίσεις > Οθόνη Wi-Fi του μενού Σύνθετες ρυθμίσεις."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Πρόβλημα ελέγχου ταυτότητας"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Εκτός εμβέλειας"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Διαθέσιμο WPS"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Δίκτυα κινητής τηλεφωνίας"</string>
<string name="location_title" msgid="1029961368397484576">"Η τοποθεσία μου"</string>
<string name="location_network_based" msgid="5569673665032992664">"Υπηρεσία τοποθεσίας Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Οι εφαρμογές μπορούν να χρησιμοποιούν δίκτυα Wi-Fi και κινητής τηλεφωνίας για τον προσδιορισμό της κατά προσέγγιση τοποθεσίας σας"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Να επιτρ. η αποστ. αν. δεδ. τοποθ. στην Google και στις εφαρμ. η χρήση δεδ. από πηγές όπως Wi-Fi και δίκ. κιν. τηλ. για τον καθορ. της κατά προσέγ. τοποθ. σας."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Η τοποθεσία καθορίζεται από το Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Δορυφόροι GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Να επιτρέπεται στις εφαρμογές η χρήση του GPS για την επισήμανση της τοποθεσίας σας"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 7841421..2f6b3d5 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Saved"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Disabled"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Avoided poor Internet connection"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"The network was avoided due to poor connection. Turn off this behaviour from the Settings > Wi-Fi screen, Advanced menu item."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authentication problem"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Not in range"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS available"</string>
@@ -767,8 +765,7 @@
<string name="sd_ejecting_title" msgid="8824572198034365468">"Unmounting"</string>
<string name="sd_ejecting_summary" msgid="2028753069184908491">"Unmount in progress"</string>
<string name="storage_menu_usb" msgid="5708207885333243384">"USB computer connection"</string>
- <!-- no translation found for storage_menu_enforce_read_external (1056191049645563747) -->
- <skip />
+ <string name="storage_menu_enforce_read_external" msgid="1056191049645563747">"Enforce read external"</string>
<string name="storage_title_usb" msgid="679612779321689418">"USB computer connection"</string>
<string name="usb_connection_category" msgid="7805945595165422882">"Connect as"</string>
<string name="usb_mtp_title" msgid="3399663424394065964">"Media device (MTP)"</string>
@@ -882,7 +879,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobile networks"</string>
<string name="location_title" msgid="1029961368397484576">"My Location"</string>
<string name="location_network_based" msgid="5569673665032992664">"Google\'s location service"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Let apps use data from sources such as Wi-Fi and mobile networks to determine your approximate location"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Allow anonymous location data to be sent to Google. Also allow permitted apps to use data from sources such as Wi-Fi and mobile networks to determine your approximate location."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Location determined by Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS satellites"</string>
<string name="location_street_level" msgid="4244496898967415234">"Let apps use GPS to pinpoint your location"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 44fed7d..e6085d2 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Guardada"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Inhabilitadas"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Mala conexión inhabilitada"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Se inhabilitó la red debido a una mala conexión. Ve a la pantalla Configuración > Wi-Fi del menú Avanzadas."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticación"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Fuera de alcance"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WSP disponible"</string>
@@ -882,7 +880,7 @@
<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="5569673665032992664">"Servicio ubicación de Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Permite que las aplicaciones usen datos de fuentes como redes Wi-Fi y móviles para establecer tu ubicación aproximada."</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Permite que los datos anónimos de ubicación se envíen a Google. Permite también que las aplicaciones utilicen datos de fuentes como Wi-Fi y redes móviles para determinar tu ubicación aproximada."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Ubicación determinada por Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Satélites de GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Permitir que las aplicaciones utilicen el GPS para indicar tu ubicación"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3b37846..0aa7937 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Guardado"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Inhabilitado"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Mala conexión inhabilitada"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Se ha inhabilitado la red porque la conexión es inestable. Desactiva esta opción en Ajustes > Wi-Fi, dentro de Ajustes avanzados."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Error de autenticación"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Fuera de rango"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
@@ -882,7 +880,7 @@
<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="5569673665032992664">"Ubicación de Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Permitir que las aplicaciones usen datos de fuentes como redes Wi-Fi y móviles para determinar tu ubicación aproximada"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Permitir que se envíen a Google datos de ubicación anónimos y que aplicaciones permitidas usen datos de fuentes (p.ej. redes móviles y Wi-Fi) para determinar ubicaciones"</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Ubicación determinada por Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Satélites GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Permitir que las aplicaciones usen el GPS para determinar tu ubicación"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index c68f924..7149dea 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Salvestatud"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Keelatud"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Halba Interneti-ühendust välditi"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Võrku välditi halva ühenduse tõttu. Funktsiooni väljalülitamiseks tehke jaotises Seaded oleval WiFi-kuval valik Täpsem."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentimise probleem"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Pole vahemikus"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS on saadaval"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobiilsidevõrgud"</string>
<string name="location_title" msgid="1029961368397484576">"Minu asukoht"</string>
<string name="location_network_based" msgid="5569673665032992664">"Google\'i asukohateenus"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Rakendustel teie ligilähedase asukoha määramiseks WiFi ja mobiilsidevõrkude andmete kasutamise lubamine"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Lubage saata Google\'ile anon. andmed. Lubage rakend. kasut. andmeid allikatest, nagu WiFi- ja mobiilsidev., et määr. oma asukoht."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"WiFi määratud asukoht"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS-i satelliidid"</string>
<string name="location_street_level" msgid="4244496898967415234">"Lubage rakendustel teie täpse asukoha määramiseks kasutada GPS-i"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index b102952..77c5100 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"ذخیره شد"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"غیرفعال شد"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"از اتصال به اینترنت ضعیف اجتناب شد"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"به دلیل اتصال ضعیف، اتصال به شبکه برقرار نشد. این عملکرد را از صفحه تنظیمات > Wi-Fi، مورد منوی پیشرفته، غیرفعال کنید."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"مشکل تأیید اعتبار"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"در محدوده نیست"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS در دسترس است"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"شبکه های تلفن همراه"</string>
<string name="location_title" msgid="1029961368397484576">"موقعیت مکانی من"</string>
<string name="location_network_based" msgid="5569673665032992664">"سرویس مکان Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"برنامهها در استفاده از منابعی مانند شبکههای Wi-Fi و تلفن همراه برای مشخص کردن موقعیت مکانی تقریبی شما مجاز باشند"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"به دادههای ناشناس مکان اجازه دهید به Google ارسال شوند. همچنین به برنامههای مجاز امکان دهید تا از دادههای منابعی مانند Wi-Fi و شبکههای تلفن همراه برای تعیین مکان تقریبی شما استفاده کنند."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"موقعیت مکانی تعیین شده توسط Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"ماهوارههای GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"به برنامهها اجازه داده شود از GPS برای اشاره دقیق به مکان شما استفاده کنند"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index a11ae3c..e385368 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Tallennettu"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Pois käytöstä"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Huono verkkoyhteys, ei muodostettu"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Verkkoon ei yhdistetty, koska sen internetyhteys on huono. Poista tämä toiminto käytöstä valikon kohdasta Asetukset > Wifi, Lisäasetukset."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Todennusvirhe"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Ei kantoalueella"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS käytettävissä"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobiiliverkot"</string>
<string name="location_title" msgid="1029961368397484576">"Oma sijainti"</string>
<string name="location_network_based" msgid="5569673665032992664">"Googlen sijaintipalvelu"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Anna sovelluksien määrittää sijaintisi wifi- ja mobiiliverkkojen tietojen avulla."</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Anna Googlen kerätä anonyymejä sijaintitietoja. Anna myös sovelluksien määrittää sijaintisi wifi- ja mobiiliverkkojen tietojen avulla."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Sijainti määritetty wifi-yhteyden perusteella"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS-satelliitit"</string>
<string name="location_street_level" msgid="4244496898967415234">"Anna sovellusten paikantaa sijaintisi GPS:n avulla"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f99427e..91a7b3c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Enregistré."</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Désactivé"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Mauvaise connexion Internet évitée"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Le réseau a été ignoré en raison d\'une mauvaise connexion. Désactivez ce comportement dans Paramètres > Wi-Fi, menu \"Avancé\"."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problème d\'authentification."</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Hors de portée"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
@@ -767,8 +765,7 @@
<string name="sd_ejecting_title" msgid="8824572198034365468">"Désinstallation en cours"</string>
<string name="sd_ejecting_summary" msgid="2028753069184908491">"Désinstallation en cours"</string>
<string name="storage_menu_usb" msgid="5708207885333243384">"Connexion USB à l\'ordinateur"</string>
- <!-- no translation found for storage_menu_enforce_read_external (1056191049645563747) -->
- <skip />
+ <string name="storage_menu_enforce_read_external" msgid="1056191049645563747">"Appliquer la lecture externe"</string>
<string name="storage_title_usb" msgid="679612779321689418">"Connexion USB à l\'ordinateur"</string>
<string name="usb_connection_category" msgid="7805945595165422882">"Connecter en tant que"</string>
<string name="usb_mtp_title" msgid="3399663424394065964">"Périphérique multimédia (MTP)"</string>
@@ -882,7 +879,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Réseaux mobiles"</string>
<string name="location_title" msgid="1029961368397484576">"Ma position"</string>
<string name="location_network_based" msgid="5569673665032992664">"Service de localisation"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Utiliser les données des réseaux Wi-Fi et mobiles pour déterminer votre position approximative"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Autoriser envoi de données de localisation anonymes à Google. Autoriser certaines applis à utiliser données des réseaux Wi-Fi et mobiles pour identifier votre position approx."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Position déterminée par le Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Satellites GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Autoriser les applications à utiliser le GPS pour localiser votre position"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 01dc550..c2876ce 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"सहेजा गया"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"अक्षम"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"खराब कनेक्शन पर ध्यान नहीं दिया गया"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"खराब कनेक्शन के कारण नेटवर्क पर ध्यान नहीं दिया गया था. सेटिंग > Wi-Fi स्क्रीन, उन्नत मेनू आइटम से इस व्यवहार को बंद करें."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"प्रमाणीकरण समस्या"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"रेंज में नहीं"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्ध"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"मोबाइल नेटवर्क"</string>
<string name="location_title" msgid="1029961368397484576">"मेरा स्थान"</string>
<string name="location_network_based" msgid="5569673665032992664">"Google की स्थान सेवा"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"एप्लिकेशन को आपका अनुमानित स्थान निर्धारित करने के लिए Wi-Fi और मोबाइल नेटवर्क जैसे स्रोतों के डेटा का उपयोग करने दें"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"अनाम स्थान डेटा Google को भेजने देता है. साथ ही आपके अनुमानित स्थान का निर्धारण करने के लिए अनुमति प्राप्त एप्लिकेशन को Wi-Fi और मोबाइल नेटवर्क जैसे स्रोतों से डेटा का उपयोग करने देता है."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Wi-Fi द्वारा निर्धारित स्थान"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS उपग्रह"</string>
<string name="location_street_level" msgid="4244496898967415234">"आपके स्थान को इंगित करने के लिए एप्लिकेशन को GPS का उपयोग करने दें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 95fc429..6e7c12e 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Spremljeno"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Onemogućeno"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Izbjegavanje slabe internetske veze"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Mreža je izbjegnuta zbog loše veze. Isključite to ponašanje na zaslonu Postavke > Wi-Fi, u stavci izbornika Napredno."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem u autentifikaciji"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Nije u rasponu"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dostupan"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobilne mreže"</string>
<string name="location_title" msgid="1029961368397484576">"Moja lokacija"</string>
<string name="location_network_based" msgid="5569673665032992664">"Googleova usluga lociranja"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Neka aplikacije upotrebljavaju podatke iz izvora kao što su Wi-Fi i mobilne mreže kako bi se utvrdila vaša približna lokacija"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Dopusti Googleu slanje anonim. lokac. podat. Dopusti dopuštenim apl. upotrebu podat. iz Wi-Fi i mob. mreža za pribl. lociranje."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokacija utvrđena pomoću Wi-Fi točke"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS sateliti"</string>
<string name="location_street_level" msgid="4244496898967415234">"Neka aplikacije upotrebljavaju GPS za označavanje vaše lokacije"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index eb03ab4..c613442 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Mentve"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Letiltva"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Került, rossz minőségű internetkapcsolat"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Hálózat elkerülve rossz kapcsolat miatt. Ezt a viselkedést kikapcsolhatja a Beállítások > Wi-Fi képernyő Haladó menüpontjában."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Azonosítási probléma"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Hatókörön kívül"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS elérhető"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobilhálózatok"</string>
<string name="location_title" msgid="1029961368397484576">"Saját pozíció"</string>
<string name="location_network_based" msgid="5569673665032992664">"A Google helyszolgáltatása"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Engedélyezze az alkalmazásoknak a Wi-Fi és mobiladatok használatát a hozzávetőleges tartózkodási hely meghatározásához"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Helyadatok küldésének engedélyezése. Az alkalmazások Wi-Fi és mobil hálózatok adatait is használhatják a helymeghatározáshoz."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Helymeghatározás Wi-Fi-vel"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS-műholdak"</string>
<string name="location_street_level" msgid="4244496898967415234">"Engedélyezze a GPS használatát az alkalmazások számára tartózkodási helyének meghatározása érdekében"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 2382654..63702a4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -113,8 +113,8 @@
<string name="bluetooth_device_name" msgid="8415828355207423800">"Nama perangkat"</string>
<string name="bluetooth_name_not_set" msgid="2653752006416027426">"Tidak ada setelan nama, menggunakan nama akun"</string>
<string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Memindai perangkat"</string>
- <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Ubah nama tablet"</string>
- <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Ubah nama ponsel"</string>
+ <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Ganti nama tablet"</string>
+ <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Ganti nama ponsel"</string>
<string name="bluetooth_rename_button" msgid="1648028693822994566">"Ganti nama"</string>
<string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Putuskan sambungan?"</string>
<string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Ini akan mengakhiri sambungan Anda dengan:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Disimpan"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Nonaktif"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Koneksi internet buruk dihindari"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Jaringan ini dihindari karena koneksi buruk. Nonaktifkan perilaku ini dari layar Setelan > Wi-Fi, item menu Lanjutan."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Masalah autentikasi"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Tidak dalam jangkauan"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tersedia"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Jaringan seluler"</string>
<string name="location_title" msgid="1029961368397484576">"Lokasiku"</string>
<string name="location_network_based" msgid="5569673665032992664">"Layanan lokasi Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Izinkan aplikasi menggunakan data dari sumber seperti jaringan Wi-Fi dan seluler untuk menentukan perkiraan lokasi Anda"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Izinkan data lokasi anonim dikirim ke Google. Izinkan apl memakai data dari jaringan seluler & Wi-Fi untuk menentukan lokasi Anda."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokasi yang dipastikan oleh Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Satelit GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Izinkan apl menggunakan GPS untuk menentukan lokasi Anda dengan tepat"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8d8a7c3..290ac86 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Salvata"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Disattivate"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Connessione Internet debole evitata"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"La rete è stata ignorata a causa della connessione scarsa. Disattiva questo comportamento dalla schermata Impostazioni > Wi-Fi, voce di menu Avanzate."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema di autenticazione"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Fuori portata"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponibile"</string>
@@ -767,8 +765,7 @@
<string name="sd_ejecting_title" msgid="8824572198034365468">"Smontaggio in corso"</string>
<string name="sd_ejecting_summary" msgid="2028753069184908491">"Smontaggio in corso"</string>
<string name="storage_menu_usb" msgid="5708207885333243384">"Connessione computer USB"</string>
- <!-- no translation found for storage_menu_enforce_read_external (1056191049645563747) -->
- <skip />
+ <string name="storage_menu_enforce_read_external" msgid="1056191049645563747">"Applica lettura (esterna)"</string>
<string name="storage_title_usb" msgid="679612779321689418">"Connessione computer USB"</string>
<string name="usb_connection_category" msgid="7805945595165422882">"Connetti come"</string>
<string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo multimediale (MTP)"</string>
@@ -882,7 +879,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Reti mobili"</string>
<string name="location_title" msgid="1029961368397484576">"La mia posizione"</string>
<string name="location_network_based" msgid="5569673665032992664">"Servizio localizzazione Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Consenti alle applicazioni di utilizzare dati di fonti come reti Wi-Fi/mobili per determinare la tua posizione approssimativa"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Consenti invio a Google di dati anonimi su posizione e ad appl. autorizz. di usare dati di fonti (reti Wi-Fi/mobili) per stabilire posizione appross."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Posizione determinata da Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Satelliti GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Consenti alle applicazioni di utilizzare il GPS per individuare la tua posizione"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index cb95b87..29b1f35 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"נשמר"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"מושבת"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"נמנע חיבור אינטרנט באיכות ירודה"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"נמנע חיבור לרשת עקב איכות חיבור ירודה. כבה התנהגות זו דרך המסך \'הגדרות\' > \'Wi-Fi\', פריט התפריט \'מתקדם\'."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"בעיית אימות"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"מחוץ לטווח"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS זמין"</string>
@@ -767,8 +765,7 @@
<string name="sd_ejecting_title" msgid="8824572198034365468">"מבטל טעינה"</string>
<string name="sd_ejecting_summary" msgid="2028753069184908491">"ביטול טעינה מתבצע"</string>
<string name="storage_menu_usb" msgid="5708207885333243384">"חיבור USB למחשב"</string>
- <!-- no translation found for storage_menu_enforce_read_external (1056191049645563747) -->
- <skip />
+ <string name="storage_menu_enforce_read_external" msgid="1056191049645563747">"אכוף קריאת אחסון חיצוני"</string>
<string name="storage_title_usb" msgid="679612779321689418">"חיבור USB למחשב"</string>
<string name="usb_connection_category" msgid="7805945595165422882">"חבר בתור"</string>
<string name="usb_mtp_title" msgid="3399663424394065964">"מכשיר מדיה (MTP)"</string>
@@ -882,7 +879,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"רשתות לנייד"</string>
<string name="location_title" msgid="1029961368397484576">"המיקום שלי"</string>
<string name="location_network_based" msgid="5569673665032992664">"שירות המיקום של Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"אפשר ליישומים להשתמש בנתונים ממקורות כגון רשתות Wi-Fi ורשתות לנייד כדי לקבוע את המיקום המשוער שלך"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"אפשר שליחה של נתוני מיקום אנונימיים אל Google. כמו כן, אפשר ליישומים מורשים להשתמש בנתונים ממקורות כגון רשתות Wi-Fi ורשתות לנייד כדי לקבוע את המיקום המשוער שלך."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"המיקום נקבע על ידי Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"לווייני GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"אפשר ליישומים להשתמש ב-GPS כדי לאתר את המיקום שלך"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e2ea0f2..dc50ebd 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -548,8 +548,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"保存済み"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"無効"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"インターネット接続不良により無効"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"接続不良のためネットワークが無効になりました。[設定]>[Wi-Fi]画面の[詳細設定]メニューでこの機能をOFFにできます。"</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"認証に問題"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"圏外"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS利用可"</string>
@@ -884,7 +882,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"モバイルネットワーク"</string>
<string name="location_title" msgid="1029961368397484576">"現在地"</string>
<string name="location_network_based" msgid="5569673665032992664">"Googleの位置情報サービス"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Wi-Fiやモバイルネットワークなどのデータを使用しておおよその現在地を特定することをアプリに許可する"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"匿名の現在地データのGoogleへの送信を許可します。Wi-Fi、モバイルネットワークなどのデータを使用したおおよその位置の特定もアプリに許可します。"</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Wi-Fiで検出される現在地"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS機能"</string>
<string name="location_street_level" msgid="4244496898967415234">"GPSを使用して現在地を特定することをアプリに許可する"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8419383..b7a1d33 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"저장됨"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"사용 중지됨"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"인터넷 접속 불량 방지"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"연결 상태가 좋지 않아 네트워크가 차단되었습니다. 설정 > Wi-Fi 화면의 고급 메뉴 항목에서 네트워크 차단을 사용 중지할 수 있습니다."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"인증 문제"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"범위 내에 없음"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS 사용 가능"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"모바일 네트워크"</string>
<string name="location_title" msgid="1029961368397484576">"사용자 위치"</string>
<string name="location_network_based" msgid="5569673665032992664">"Google 위치 서비스"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"앱에서 Wi-Fi 및 모바일 네트워크와 같은 소스의 데이터를 사용하여 사용자의 대략적인 위치를 판단할 수 있게 합니다."</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"익명의 위치 정보를 Google에 전송하도록 허용합니다. 또한 허용된 앱에서 Wi-Fi 및 모바일 네트워크와 같은 소스의 데이터를 사용하여 사용자의 대략적인 위치를 판단할 수 있게 합니다."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Wi-Fi에서 측정된 위치"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS 위성"</string>
<string name="location_street_level" msgid="4244496898967415234">"애플리케이션이 GPS를 사용하여 현재 위치를 정확하게 찾도록 합니다."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 73ef4df..110f7ff 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Išsaugotas"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Neleidžiama"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Išvengta prasto interneto ryšio"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Tinklas buvo praleistas dėl silpno ryšio. Išjunkite šį veiksmą ekrane „Nustatymai“ > „Wi-Fi“, pasirinkę meniu elementą „Išplėstiniai“."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentifikavimo problema"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Ne diapazone"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Galima WPS"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobilūs tinklai"</string>
<string name="location_title" msgid="1029961368397484576">"Mano vieta"</string>
<string name="location_network_based" msgid="5569673665032992664">"„Google“ vietos paslauga"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Leisti programai naudoti duomenis iš šaltinių, pvz., „Wi-Fi“ ir mobiliojo ryšio tinklų, kad būtų nustatyta apytikslė vieta"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Leis. siųsti „Google“ an. vietos duom. Taip pat leis. pr. naud. duom. iš „Wi-Fi“ ir mob. r. tinklų, kad būtų nust. jūsų apyt. vt."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Vietą nustatė „Wi-Fi“"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS palydovai"</string>
<string name="location_street_level" msgid="4244496898967415234">"Leisti programoms naudoti GPS jūsų vietai nurodyti"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 04c9df6..3525a4c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Saglabāts"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Atspējots"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Novērsts nekvalitatīvs interneta savienojums"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Vāja savienojuma signāla dēļ netika izveidots savienojums ar tīklu. Lai izslēgtu šo funkciju, ekrānos Iestatījumi > Wi-Fi atlasiet izvēlnes vienumu Papildu."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentificēšanas problēma"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Nav diapazona ietvaros"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ir pieejams"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobilo sakaru tīkli"</string>
<string name="location_title" msgid="1029961368397484576">"Mana atrašanās vieta"</string>
<string name="location_network_based" msgid="5569673665032992664">"Google atrašanās vietas pak."</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Ļaut lietotnēm izmantot datus no tādiem avotiem kā Wi-Fi un mobilie tīkli, lai aptuveni noteiktu jūsu atrašanās vietu."</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Ļaut nos. Google serv. anon. datus par vietu. Ļaut atļ. liet. izm. datus no Wi-Fi un mob. tīkliem, lai apt. not. vietu."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Wi-Fi noteikta atrašanās vieta"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS satelīti"</string>
<string name="location_street_level" msgid="4244496898967415234">"Atļaut lietotnēm izmantot GPS, lai noteiktu jūsu atrašanās vietu"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 82b9900..4adf90f 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Disimpan"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Dinyahdayakan"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Sambungan Internet lemah dielakkan"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Rangkaian dielakkan kerana sambungan lemah. Matikan tindakan ini dari skrin Tetapan > Wi-Fi, item menu Lanjutan."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Masalah pengesahan"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Tidak dalam liputan"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tersedia"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Rangkaian mudah alih"</string>
<string name="location_title" msgid="1029961368397484576">"Lokasi Saya"</string>
<string name="location_network_based" msgid="5569673665032992664">"Perkhidmatan lokasi Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Benarkan aplikasi menggunakan data dari sumber seperti rangkaian Wi-Fi dan mudah alih untuk menentukan lokasi anggaran anda"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Membenarkan data lokasi tanpa nama dihantar ke Google. Juga membenarkan apl dibenarkan untuk menggunakan data dari sumber seperti Wi-Fi dan rangkaian mudah alih untuk menentukan lokasi anggaran anda."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokasi ditentukan oleh Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Satelit GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Benarkan apl menggunakan GPS untuk menunjukkan lokasi anda dengan tepat"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9c55969..e51e17f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Lagret"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktivert"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Ungikk dårlig internettforbindelse"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Nettverket ble unngått på grunn av dårlig forbindelse. Slå av denne funksjonen under Innstillinger > Wi-Fi, under menyvalget Avansert."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentiseringsproblem"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Utenfor område"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tilgjengelig"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobile nettverk"</string>
<string name="location_title" msgid="1029961368397484576">"Min posisjon"</string>
<string name="location_network_based" msgid="5569673665032992664">"Googles posisjonstjeneste"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"La apper bruke data fra kilder som Wi-Fi- og mobilnettverk til å fastslå den omtrentlige posisjonen din"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Tillat at posisjonsdata sendes til Google. La også tillatte apper bruke data fra kilder som Wi-Fi og mobilnettverk til å fastslå den omtrentlige posisjonen din."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Posisjon fastsatt av Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS-satellitter"</string>
<string name="location_street_level" msgid="4244496898967415234">"La apper bruke GPS for å finne posisjonen din"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f3a31a2..05519cb 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Opgeslagen"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Uitgeschakeld"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Slechte internetverbinding vermeden"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Netwerk vermeden wegens slechte verbinding. U kunt het vermijden van netwerken met een slechte verbinding uitschakelen via \'Instellingen\' > het scherm \'Wifi\' en het menu-item \'Geavanceerd\'."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authenticatieprobleem"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Niet binnen bereik"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS beschikbaar"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobiele netwerken"</string>
<string name="location_title" msgid="1029961368397484576">"Mijn locatie"</string>
<string name="location_network_based" msgid="5569673665032992664">"Locatieservice van Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Apps gegevens laten gebruiken uit bronnen zoals mobiele en wifi-netwerken om uw locatie te schatten"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Toestaan dat anonieme locatiegegevens worden verzonden naar Google. Ook toestaan dat toegestane apps gegevens uit bronnen zoals mobiele en wifi-netwerken gebruiken om uw geschatte locatie te bepalen."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Locatie bepaald via Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS-satellieten"</string>
<string name="location_street_level" msgid="4244496898967415234">"Apps toestaan GPS te gebruiken om uw locatie te bepalen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 244036e..f909376 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Zapisana"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Wyłączona"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Uniknięto połączenia internetowego o niskiej jakości."</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Sieć została pominięta ze względu na słabe połączenie. Wyłącz to zachowanie, przechodząc do ekranu Ustawienia > Wi-Fi i wybierając w menu pozycję Zaawansowane."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem z uwierzytelnianiem"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Poza zasięgiem"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Protokół WPS jest dostępny"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Sieci komórkowe"</string>
<string name="location_title" msgid="1029961368397484576">"Moja lokalizacja"</string>
<string name="location_network_based" msgid="5569673665032992664">"Usługa lokalizacyjna"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Zezwól aplikacjom na używanie danych (np. z sieci Wi-Fi lub komórkowych) do określania przybliżonej lokalizacji"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Zezwalaj na przesyłanie do Google anonimowych danych o lokalizacji. Zezwalaj uprawnionym aplikacjom na określanie przybliżonej lokalizacji z użyciem sieci Wi-Fi i komórkowych."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokalizacja określona na podstawie sieci Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Satelity GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Zezwalaj aplikacjom na określanie mojej lokalizacji za pomocą GPS"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b2cd467..78b1f42 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Guardada"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Desativado"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Evitada ligação à internet fraca"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"A rede foi evitada devido a uma ligação fraca. Desative essa opção no ecrã Definições > Wi-Fi, no item de menu Avançadas."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticação"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Fora do alcance"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
<string name="location_title" msgid="1029961368397484576">"A minha localização"</string>
<string name="location_network_based" msgid="5569673665032992664">"Serviço de localiz. do Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Permita que as aplicações utilizem dados de fontes como redes Wi-Fi e de telemóvel para determinar a sua localização aproximada"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Permitir que os dados de localização anónimos sejam enviados para a Google. Permitir também que aplicações autorizadas utilizem dados de fontes como Wi-Fi e redes de telemóvel para determinar a sua localização aproximada."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Localização determinada por Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Satélites GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Permitir que aplicações utilizem GPS para localizar a sua posição"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a0b2f29..dd3d33c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Salva"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Desativado"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Conexão com a Internet de baixa qualidade evitada"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"A rede foi evitada devido à má conexão. Desative esse comportamento a partir da tela Configurações > Wi-Fi, Item de menu avançado."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticação"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Não está dentro do alcance"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
<string name="location_title" msgid="1029961368397484576">"Meu Local"</string>
<string name="location_network_based" msgid="5569673665032992664">"Serv. de loc. do Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Permite que os aplicativos usem dados de fontes como redes Wi-Fi e móveis para determinar sua localização aproximada"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Permit. envio de dados local. anôn. ao Google. Também permit. aplic. autor usar dados de Wi-Fi e redes móveis p/ determ loc aprox."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Localização determinada por Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Satélites de GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Permitir que o aplicativo use o GPS para localizar sua posição"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 12e494e..f35ba98 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -789,9 +789,6 @@
<skip />
<!-- no translation found for wifi_disabled_network_failure (3111321240793227690) -->
<skip />
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <!-- no translation found for wifi_disabled_help (5416325603334140666) -->
- <skip />
<!-- no translation found for wifi_disabled_password_failure (8659805351763133575) -->
<skip />
<string name="wifi_not_in_range" msgid="1136191511238508967">"Betg cuntanschibel"</string>
@@ -1293,7 +1290,7 @@
<string name="location_title" msgid="1029961368397484576">"Mes lieu"</string>
<!-- no translation found for location_network_based (5569673665032992664) -->
<skip />
- <!-- no translation found for location_neighborhood_level (1337612962522836900) -->
+ <!-- no translation found for location_neighborhood_level (2948129720516513300) -->
<skip />
<!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
<skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 330520c..2bc3b70 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Salvată"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Dezactivată"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"S-a evitat o conexiune de internet slabă"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Reţeaua a fost evitată din cauza conexiunii slabe. Dezactivaţi acest comportament din ecranul Setări > Wi-Fi, elementul de meniu Avansate."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problemă la autentificare"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"În afara ariei de acoperire"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponibil"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Reţele mobile"</string>
<string name="location_title" msgid="1029961368397484576">"Locaţia mea"</string>
<string name="location_network_based" msgid="5569673665032992664">"Serviciul de localizare Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Permiteţi aplic. să util. date din surse ca reţelele Wi-Fi şi mobile pt. a determina locaţia aprox."</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Permiteţi trimiterea de date anonime de localizare la Google. Permiteţi aplic. acceptate să utilizeze date din surse ca reţelele Wi-Fi sau mobile pt. a determina locaţia aprox."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Locaţie stabilită prin Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Sateliţi GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Permiteţi aplicaţiilor să utilizeze GPS pentru a indica locaţia dvs."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e15aa99..9f7bb68 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Сохранено"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Отключено"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Включено"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Сеть отклонена, так как соединение неустойчивое. Чтобы изменить параметры, выберите \"Настройки > Wi-Fi\" и откройте меню \"Дополнительные функции\"."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Ошибка аутентификации"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Недоступна"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Поддерживает WPS"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Мобильная сеть"</string>
<string name="location_title" msgid="1029961368397484576">"Мое местоположение"</string>
<string name="location_network_based" msgid="5569673665032992664">"По координатам сети"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Использовать Wi-Fi и мобильные сети для определения местоположения"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Разрешить отправку анонимных данных о местоположении и позволить приложениям определять его с помощью Wi-Fi и мобильных сетей."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Местоположение определяется с помощью Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"По спутникам GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Разрешить приложениям использовать GPS для точного определения вашего местоположения"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 1961f42..f23f4c0 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Uložené"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Zakázané"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Bolo zabránené slabému internetovému pripojeniu"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Sieť nebola použitá z dôvodu slabého pripojenia. Toto nastavenie môžete vypnúť na obrazovke Nastavenia > Wi-Fi v položke ponuky Rozšírené."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problém s overením totožnosti"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Mimo dosah"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozícii"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobilné siete"</string>
<string name="location_title" msgid="1029961368397484576">"Moja poloha"</string>
<string name="location_network_based" msgid="5569673665032992664">"Služba určovania polohy Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Povoliť aplikáciám používať údaje zo siete Wi-Fi a mobilných sietí na určenie približnej polohy"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Povoliť odosielanie anonymných údajov o polohe spoločnosti Google. Umožniť tiež povoleným aplikáciám určiť vašu približnú polohu pomocou údajov zo zdrojov ako sú mobilné siete a siete Wi-Fi."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Poloha je určená podľa siete Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Satelity GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Povoliť aplikáciám použiť zariadenie GPS na určenie vašej polohy"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9679edb..934bfce 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Shranjeno"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Onemogočeno"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Slaba internetna povezava je bila izpuščena"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Omrežje zaradi slabe povezave ni bilo uporabljeno. To delovanje lahko izklopite v nastavitvah, tako da na zaslonu za Wi-Fi izberete menijski element »Dodatno«."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Težava s preverjanjem pristnosti"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Ni v obsegu"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je na voljo"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobilna omrežja"</string>
<string name="location_title" msgid="1029961368397484576">"Moja lokacija"</string>
<string name="location_network_based" msgid="5569673665032992664">"Googlova lokacijska storitev"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Programi lahko za določanje približne lokacije uporabijo podatke iz omrežij Wi-Fi in mobilnih omrežij"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Dovoli pošilj. anon. lok. pod. Googlu. Odobr. aplikac. dov. upor. pod. iz virov, kot so Wi-Fi in mob. omr., za dol. pribl. lokac."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokacija, ugotovljena prek omrežja Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Sateliti GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Naj programi uporabijo GPS za določitev vašega položaja"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 75bda8d..785f145 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Сачувано"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Онемогућено"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Онемогућено због лоше интернет везе"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Мрежа је избегнута због лоше везе. Искључите ово подешавање на екрану Подешавања > Wi-Fi, ставка менија Напредно."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблем са потврдом аутентичности"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Није у опсегу"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS је доступан"</string>
@@ -882,7 +880,8 @@
<string name="network_settings_title" msgid="7967552516440151852">"Мобилне мреже"</string>
<string name="location_title" msgid="1029961368397484576">"Мојa локацијa"</string>
<string name="location_network_based" msgid="5569673665032992664">"Google-ова услуга лоцирања"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Нека апликације користе податке из извора као што су Wi-Fi и мобилне мреже за приближну локацију"</string>
+ <!-- no translation found for location_neighborhood_level (2948129720516513300) -->
+ <skip />
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Локација се одређује помоћу Wi-Fi-ја"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS сателити"</string>
<string name="location_street_level" msgid="4244496898967415234">"Дозволи да апликације користе GPS како би тачно одредиле локацију"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 09a0376..ee587e0 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Sparat"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Inaktiverad"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Undvek dålig Internetanslutning"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Nätverket undveks på grund av dålig anslutning. Inaktivera funktionen från skärmen Inställningar > Wi-Fi på menyn Avancerat."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentiseringsproblem"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Inte i intervall"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tillgängligt"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobila nätverk"</string>
<string name="location_title" msgid="1029961368397484576">"Min plats"</string>
<string name="location_network_based" msgid="5569673665032992664">"Googles platstjänst"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Tillåt att appar använder data från källor som Wi-Fi-nätverk och nätverk för mobilenheter för att avgöra din ungefärliga position"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Tillåt att anonyma platsdata skickas till Google. Tillåt även att appar med tillstånd använder data från källor som Wi-Fi-nätverk och nätverk för mobilenheter för att avgöra din ungefärliga position."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Platsen fastställs av Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS-satelliter"</string>
<string name="location_street_level" msgid="4244496898967415234">"Låter appar använda GPS för att se var du befinner dig"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 84483aa..a3e03f4 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -536,8 +536,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Imehifadhiwa"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Imelemazwa"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Kuepukwa muunganisho mbaya wa Tovuti"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"mtandao uliepukwa kutokana na muunganisho hafifu. Zima mtindo huu kutoka kwa mipangilio & scrini ya wifi, kipengee cha menyu ya Juu."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Tatizo la uthibitishaji"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Haiko karibu"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS inapatikana"</string>
@@ -872,7 +870,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mitandao ya simu"</string>
<string name="location_title" msgid="1029961368397484576">"Mahali pangu"</string>
<string name="location_network_based" msgid="5569673665032992664">"Eneo la huduma ya Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Wacha programu itumie data kutoka kwa vyanzo kama zile za Wi-Fi na mitandao ya simu ili kuamua kadirio la eneo lako"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Ruhusu data ya eneo bila jina kutumwa kwa Google. Ruhusu pia programu kutumia data kutoka vyanzo kama vile Wi-Fi na mitandao ya vifaa vya mkononi ili kubainisha eneo lako la karibu."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Mahali pame tathminiwa na Mtandao hewa"</string>
<string name="location_gps" msgid="8392461023569708478">"Setileti za GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Ruhusu programu kutumia GPS kupata mahali pako"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0708f83..c2182e6 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"บันทึกแล้ว"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"ปิดใช้งานแล้ว"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"หลีกเลี่ยงการเชื่อมต่ออินเทอร์เน็ตที่สัญญาณไม่แรงพอ"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"เครือข่ายถูกหลีกเลี่ยงเนื่องจากมีการเชื่อมต่อที่ไม่ดีพอ ปิดคุณลักษณะนี้ได้ในการตั้งค่า > หน้าจอ WiFi ที่รายการเมนูขั้นสูง"</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ปัญหาในการตรวจสอบสิทธิ์"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"ไม่อยู่ในพื้นที่ให้บริการ"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ใช้งานได้"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"เครือข่ายมือถือ"</string>
<string name="location_title" msgid="1029961368397484576">"ตำแหน่งของฉัน"</string>
<string name="location_network_based" msgid="5569673665032992664">"บริการแสดงตำแหน่งของ Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"อนุญาตให้แอปพลิเคชันใช้ข้อมูลจากแหล่งต่างๆ เช่น Wi-Fi และเครือข่ายมือถือในการระบุตำแหน่งโดยประมาณของคุณ"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"อนุญาตให้ส่งข้อมูลตำแหน่งไม่ระบุชื่อไปที่ Google, ให้แอปฯ ที่รับอนุญาตใช้ข้อมูลจากแหล่งเช่น WiFi, เครือข่ายมือถือเพื่อกำหนดตำแหน่ง"</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"ตำแหน่งที่กำหนดโดย Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"ดาวเทียม GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"ให้แอปพลิเคชันใช้ GPS เพื่อระบุตำแหน่งของคุณ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0ae6827..1f680a8 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Na-save"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Hindi Pinagana"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Iniwasan ang mahinang koneksyon sa Internet"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Iniwasan ang network dahil sa mahinang koneksyon. I-off ang pag-uugaling ito mula sa Mga Setting > screen na Wi-Fi, item ng menu na Advanced."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema sa pagpapatotoo"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Wala sa sakop"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Available ang WPS"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mga mobile network"</string>
<string name="location_title" msgid="1029961368397484576">"Aking Lokasyon"</string>
<string name="location_network_based" msgid="5569673665032992664">"Serbisyo sa lokasyon ng Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Hayaan ang apps na gumamit ng data mula sa mga pinagmulang tulad ng mga Wi-Fi at mobile na network upang tukuyin ang iyong tinatayang lokasyon"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Payagang maipadala sa Google ang hindi kilalang data ng lokasyon. Payagan din ang mga pinahihintulutang app na gamitin ang data mula sa mga pinagmulan gaya ng Wi-Fi at mga mobile network upang tukuyin ang iyong tinatayang lokasyon."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Natukoy ang lokasyon ng Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Mga GPS Satellite"</string>
<string name="location_street_level" msgid="4244496898967415234">"Hayaan ang mga app na gamitin ang GPS upang tukuyin ang iyong lokasyon"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index fd446a7..fd2a44f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Kaydedildi"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Devre dışı"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Kötü İnternet bağlantısından kaçınıldı"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Zayıf bağlantı nedeniyle ağ kullanılmadı. Ayarlar > Kablosuz ekranı, Gelişmiş menü öğesi ile bu davranışı kapatın."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Kimlik doğrulama sorunu"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Kapsama alanı dışında"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS kullanılabilir"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mobil ağlar"</string>
<string name="location_title" msgid="1029961368397484576">"Konumum"</string>
<string name="location_network_based" msgid="5569673665032992664">"Google\'ın konum hizmeti"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Uygulamalar yaklaşık konumumu belirlemek için Kablosuz ve mobil ağlar gibi kaynaklardan gelen verileri kullansın"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Anonim konum verilerinin Google\'a gönderilmesine izin ver. Ayrıca, izin verilen uygulamaların da yaklaşık konumunuzu belirlemek üzere Kablosuz ve mobil ağlar gibi kaynaklardan gelen verileri kullanmalarına izin ver."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Konum, Kablosuz tarafından belirlendi"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS uyduları"</string>
<string name="location_street_level" msgid="4244496898967415234">"Konumunuzu belirlemek üzere uygulamaların GPS kullanmasına izin verir"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index e22a64d..89ba1ef 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Збережено"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Вимкнено"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Слабке з’єднання з Інтернетом не встановлено"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Не підключено до мережі через слабке з’єднання. Цю поведінку можна вимкнути в меню \"Розширені\" на екрані Налаштування > Wi-Fi."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблема з автентифікацією"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Не в діапазоні"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Є доступ до WPS"</string>
@@ -767,8 +765,7 @@
<string name="sd_ejecting_title" msgid="8824572198034365468">"Відключення"</string>
<string name="sd_ejecting_summary" msgid="2028753069184908491">"Виконується відключ."</string>
<string name="storage_menu_usb" msgid="5708207885333243384">"USB-з’єднання комп’ютера"</string>
- <!-- no translation found for storage_menu_enforce_read_external (1056191049645563747) -->
- <skip />
+ <string name="storage_menu_enforce_read_external" msgid="1056191049645563747">"Примусово читати зовнішню пам’ять"</string>
<string name="storage_title_usb" msgid="679612779321689418">"USB-з’єднання комп’ютера"</string>
<string name="usb_connection_category" msgid="7805945595165422882">"Під’єднати як"</string>
<string name="usb_mtp_title" msgid="3399663424394065964">"Пристрій зберігання даних (MTP)"</string>
@@ -882,7 +879,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Мобільні мережі"</string>
<string name="location_title" msgid="1029961368397484576">"Моє місцезнах."</string>
<string name="location_network_based" msgid="5569673665032992664">"Служба визнач. місцезн. Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Дозволяє програмам використовувати дані з таких джерел, як мережі Wi-Fi і мобільні мережі, щоб визначати ваше приблизне місцезнах."</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Дозвол. надсил. анон. дані місцезн. в Google. І дозв. програмам викор. дані з мереж Wi-Fi і моб. мереж для визнач. прибл. місцезн."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Місцезнаходження, визначене Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Супутникові тарілки GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Дозволити програмам використовувати GPS для точного визначення вашого місцезнаходження"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 374c87b..2088144 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Đã lưu"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Đã tắt"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Đã tránh kết nối Internet kém"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Mạng này đã bị tránh do kết nối kém. Hãy tắt hiện tượng này từ màn hình Cài đặt > Wi-Fi, mục trình đơn Nâng cao."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Sự cố xác thực"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Ngoài vùng phủ sóng"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Có WPS"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Mạng di động"</string>
<string name="location_title" msgid="1029961368397484576">"Vị trí của tôi"</string>
<string name="location_network_based" msgid="5569673665032992664">"Dịch vụ vị trí của Google"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Cho phép ứng dụng sử dụng dữ liệu từ các nguồn như mạng Wi-Fi và mạng di động để xác định vị trí gần đúng của bạn"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Cho phép gửi dữ liệu vị trí ẩn danh cho Google. Đồng thời cho phép các ứng dụng được phép sử dụng dữ liệu từ nguồn như Wi-Fi và mạng di động để xác định vị trí gần đúng của bạn."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Vị trí được xác định bằng Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"Vệ tinh GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Cho phép ứng dụng GPS xác định vị trí của bạn"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f15b58a..b7a28ff 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"已保存"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"已停用"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"已停用状况不佳的互联网连接"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"系统因连接状况不佳而停用了该网络。您可以通过“设置”>“Wi-Fi”屏幕中的“高级”菜单项关闭此功能。"</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"身份验证出现问题"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"不在范围内"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"可使用 WPS"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"移动网络"</string>
<string name="location_title" msgid="1029961368397484576">"我的位置"</string>
<string name="location_network_based" msgid="5569673665032992664">"Google 的位置服务"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"允许应用程序使用来自 Wi-Fi 或移动网络的数据确定您的大致位置"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"允许系统将匿名地点数据发送给 Google。同时允许具有权限的应用使用来自 Wi-Fi 和移动网络等来源的数据，以便确定您所在的大概位置。"</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"通过 Wi-Fi 确定位置"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS 卫星"</string>
<string name="location_street_level" msgid="4244496898967415234">"允许应用程序使用 GPS 对您进行定位"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index adb90f0..8a8bd8b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"已儲存"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"已停用"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"已避開品質不佳的網際網路連線"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"已避開這個連線品質不佳的網路。您可以前往 [設定] > [Wi-Fi 畫面]，選取 [進階] 選單項目關閉這個行為。"</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"驗證問題"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"不在有效範圍內"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"可使用 WPS"</string>
@@ -882,7 +880,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"行動網路"</string>
<string name="location_title" msgid="1029961368397484576">"我的位置"</string>
<string name="location_network_based" msgid="5569673665032992664">"Google 的定位服務"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"讓應用程式使用 Wi-Fi 和行動網路等來源的資料測定您的約略位置"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"允許系統將匿名的位置資料傳送到 Google，也允許授權的應用程式使用 WiFi 和行動網路等來源資料判斷您的約略位置。"</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"根據 Wi-Fi 判定位置"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS 衛星定位"</string>
<string name="location_street_level" msgid="4244496898967415234">"允許應用程式使用 GPS 定出您的精確位置"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index cc0b3fb..b3103d3 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -546,8 +546,6 @@
<string name="wifi_remembered" msgid="4955746899347821096">"Kulondoloziwe"</string>
<string name="wifi_disabled_generic" msgid="4259794910584943386">"Akusebenzi"</string>
<string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Kugwenyiwe ukungaxhumeki kahle"</string>
- <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
- <string name="wifi_disabled_help" msgid="5416325603334140666">"Inethiwekhi igwenyiwe ngenx yokuxhumaniseka okubi. Cisha lokhu Ezisethweni > Iskrini se-Wi-Fi, into ekwimenyu ejulile."</string>
<string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Inkinga yokufakazela ubuqiniso"</string>
<string name="wifi_not_in_range" msgid="1136191511238508967">"Ayikho ebubanzini"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"i-WPS iyatholakala"</string>
@@ -883,7 +881,7 @@
<string name="network_settings_title" msgid="7967552516440151852">"Amanethiwekhi eselula"</string>
<string name="location_title" msgid="1029961368397484576">"Indawo Yami"</string>
<string name="location_network_based" msgid="5569673665032992664">"Isevisi yakwa-Google yokuthola indawo"</string>
- <string name="location_neighborhood_level" msgid="1337612962522836900">"Yenza insiza isebenzise i-data esuka emithonjeni enjenge-Wi-Fi kanye nokuxhumaniseka komakhalekhukhwini ukuze kuhlonzeke ukuthi cishe ukephi nendawo"</string>
+ <string name="location_neighborhood_level" msgid="2948129720516513300">"Vumela idatha yendawo engaziwa ukuthunelwa ku-Google. Futhi vumela izinhlelo zokusebenza ezivumelekile ukusebenzisa idatha kusuka kumithombo efana ne-Wi-Fi namanethiwekhi weselula ukucacisa cishe indawo yakho."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Indawo itholwe i-Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"amasethalayithi e-GPS"</string>
<string name="location_street_level" msgid="4244496898967415234">"Vumela i-GPS ukubonisa indawo yakho"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 71564c5..99def81 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -639,6 +639,13 @@
<!-- Security settings screen when using face unlock, setting option name to start an activity that allows the user to improve accuracy by adding additional enrollment faces -->
<string name="biometric_weak_improve_matching_title">Improve face matching</string>
+ <!-- On the security settings screen when using face unlock. This checkbox is used to toggle whether liveliness detection is required. If it is checked the user must blink during unlock to prove it's not a photo -->
+ <string name="biometric_weak_liveliness_title">Require eye blink</string>
+ <!-- On the security settings screen when using face unlock. The summary of the liveliness checkbox -->
+ <string name="biometric_weak_liveliness_summary" product="tablet">Prevent others from using a photo of you to unlock your tablet</string>
+ <!-- On the security settings screen when using face unlock. The summary of the liveliness checkbox -->
+ <string name="biometric_weak_liveliness_summary" product="default">Prevent others from using a photo of you to unlock your phone</string>
+
<!-- Security settings screen, setting option name to change screen timeout -->
<string name="lock_after_timeout">Automatically lock</string>
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index 080fbc9..4a41431 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -31,6 +31,11 @@
android:title="@string/biometric_weak_improve_matching_title"/>
<CheckBoxPreference
+ android:key="biometric_weak_liveliness"
+ android:title="@string/biometric_weak_liveliness_title"
+ android:summary="@string/biometric_weak_liveliness_summary"/>
+
+ <CheckBoxPreference
android:key="visiblepattern"
android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index adf8c37..df4baf6 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -53,6 +53,7 @@
private static final String KEY_UNLOCK_SET_OR_CHANGE = "unlock_set_or_change";
private static final String KEY_BIOMETRIC_WEAK_IMPROVE_MATCHING =
"biometric_weak_improve_matching";
+ private static final String KEY_BIOMETRIC_WEAK_LIVELINESS = "biometric_weak_liveliness";
private static final String KEY_LOCK_ENABLED = "lockenabled";
private static final String KEY_VISIBLE_PATTERN = "visiblepattern";
private static final String KEY_TACTILE_FEEDBACK_ENABLED = "unlock_tactile_feedback";
@@ -74,6 +75,7 @@
private LockPatternUtils mLockPatternUtils;
private ListPreference mLockAfter;
+ private CheckBoxPreference mBiometricWeakLiveliness;
private CheckBoxPreference mVisiblePattern;
private CheckBoxPreference mTactileFeedback;
@@ -155,6 +157,10 @@
updateLockAfterPreferenceSummary();
}
+ // biometric weak liveliness
+ mBiometricWeakLiveliness =
+ (CheckBoxPreference) root.findPreference(KEY_BIOMETRIC_WEAK_LIVELINESS);
+
// visible pattern
mVisiblePattern = (CheckBoxPreference) root.findPreference(KEY_VISIBLE_PATTERN);
@@ -322,6 +328,10 @@
createPreferenceHierarchy();
final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
+ if (mBiometricWeakLiveliness != null) {
+ mBiometricWeakLiveliness.setChecked(
+ lockPatternUtils.isBiometricWeakLivelinessEnabled());
+ }
if (mVisiblePattern != null) {
mVisiblePattern.setChecked(lockPatternUtils.isVisiblePatternEnabled());
}
@@ -354,6 +364,8 @@
CONFIRM_EXISTING_FOR_BIOMETRIC_IMPROVE_REQUEST, null, null)) {
startBiometricWeakImprove(); // no password set, so no need to confirm
}
+ } else if (KEY_BIOMETRIC_WEAK_LIVELINESS.equals(key)) {
+ lockPatternUtils.setBiometricWeakLivelinessEnabled(isToggled(preference));
} else if (KEY_LOCK_ENABLED.equals(key)) {
lockPatternUtils.setLockPatternEnabled(isToggled(preference));
} else if (KEY_VISIBLE_PATTERN.equals(key)) {
diff --git a/src/com/android/settings/bluetooth/BluetoothEventManager.java b/src/com/android/settings/bluetooth/BluetoothEventManager.java
index 9140b25..a6d9bcf 100644
--- a/src/com/android/settings/bluetooth/BluetoothEventManager.java
+++ b/src/com/android/settings/bluetooth/BluetoothEventManager.java
@@ -139,8 +139,6 @@
private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
- Log.v(TAG, "Received " + intent.getAction());
-
String action = intent.getAction();
BluetoothDevice device = intent
.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);