diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index b82a733..e5a7dbe 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Hoë batterygebruik"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Lae batterygebruik"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Liggingmodus"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Gebruik GPS, Wi‑Fi en selnetwerke om ligging te bereken"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Gebruik Wi‑Fi en selnetwerke om ligging te bereken"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Gebruik GPS om jou ligging haarfyn aan te wys"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Gebruik GPS, Wi‑Fi en mobiele netwerke om ligging te bepaal"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Gebruik Wi‑Fi en mobiele netwerke om ligging te bepaal"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Gebruik GPS om jou ligging te bepaal"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Haal tans op…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi- en mobielenetwerk-ligging"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Laat programme Google se liggingsdiens gebruik om jou ligging vinniger te beraam. Anonieme liggingsdata sal ingesamel word en aan Google gestuur word."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index e044d15..def9fb0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"ከፍተኛ የባትሪ አጠቃቀም"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"ዝቅተኛ የባትሪ አጠቃቀም"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"የአካባቢ ሁነታ"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"አካባቢ ለመገመት ጂ ፒ ኤስ፣ Wi‑Fi እና የተንቀሳቃሽ ስልክ አውታረ መረቦችን ይጠቀሙ"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"አካባቢን ለመገመት Wi‑Fiን እና የተቀሳቃሽ ስልክ አውታረ መረቦችን ይጠቀሙ"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"አካባቢዎን ለመለየት ጂ ፒ ኤስ ይጠቀሙ"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"አካባቢ ለማወቅ ጂ ፒ ኤስ፣ Wi‑Fi እና የተንቀሳቃሽ ስልክ አውታረ መረቦችን ይጠቀሙ"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"አካባቢን ለማወቅ Wi‑Fiን እና የተንቀሳቃሽ ስልክ አውታረ መረቦችን ይጠቀሙ"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"የእርስዎን አካባቢ ለማወቅ ጂ ፒ ኤስ ይጠቀሙ"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"ሰርስሮ በማውጣት ላይ…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"የWi-Fi እና የተንቀሳቃሽ ስልክ አውታረ መረብ አካባቢ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"መተግበሪያዎች አካባቢዎትን በበለጠ ፍጥነት እንዲገምቱ የGoogle የአካባቢ አገልግሎትን ይጠቀሙ። ስም አልባ የአካባቢ ውሂብ ተሰብስቦ ወደ Google ይላካል።"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index a8f5366..ef997ed 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -352,42 +352,42 @@
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"اختر قفلاً للنسخ الاحتياطي"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"تأمين الشاشة"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"تغيير تأمين الشاشة"</string>
-    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"تغيير أو تعطيل النقش أو رقم التعريف الشخصي أو أمان كلمة المرور"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"‏تغيير أو تعطيل النقش أو رمز PIN أو أمان كلمة المرور"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"اختيار طريقة لتأمين الشاشة"</string>
     <string name="unlock_backup_info_summary" msgid="108524727803788172">"عندما لا يتمكن تأمين الجهاز بالوجه من التعرف عليك، كيف تريد إلغاء التأمين؟"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"لا شيء"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
-    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"شريحة"</string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"مسح"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"بدون تأمين"</string>
     <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"بالوجه"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"تأمين منخفض، تجريبي"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"نقش"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"تأمين متوسط"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"رقم التعريف الشخصي"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"‏رمز PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"من تأمين متوسط إلى عال"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"كلمة المرور"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"تأمين عال"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"تم تعطيله من جانب المشرف أو بسبب سياسة التشفير أو وحدة تخزين بيانات الاعتماد"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"لا شيء"</string>
-    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"شريحة"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"مسح"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"تأمين الجهاز بالوجه"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"نقش"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"رقم التعريف الشخصي"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"‏رمز PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"كلمة المرور"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"إيقاف تأمين الشاشة"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"إزالة نقش إلغاء التأمين"</string>
-    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"إزالة رقم التعريف الشخصي لإلغاء التأمين"</string>
+    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"‏إزالة رمز PIN لإلغاء التأمين"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"إزالة كلمة مرور إلغاء التأمين"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"تغيير نقش إلغاء التأمين"</string>
-    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"تغيير رقم التعريف الشخصي لإلغاء التأمين"</string>
+    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"‏تغيير رمز PIN لإلغاء التأمين"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغيير كلمة مرور إلغاء التأمين"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"‏يجب أن تكون كلمة المرور %d من الأحرف على الأقل"</string>
-    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"‏يجب أن يكون رقم التعريف الشخصي %d من الأرقام على الأقل"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"‏يجب أن يكون رمز PIN %d من الأرقام على الأقل"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"المس \"متابعة\" عند الانتهاء"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"متابعة"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"يجب أن تكون كلمة المرور أقل من <xliff:g id="NUMBER">%d</xliff:g> من الأحرف."</string>
-    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"يجب أن يكون رقم التعريف الشخصي أقل من <xliff:g id="NUMBER">%d</xliff:g> من الأرقام."</string>
-    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"يجب ألا يحتوي رقم التعريف الشخصي سوى على أرقام من 0 إلى 9 فقط."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"‏يجب أن يكون رمز PIN أقل من <xliff:g id="NUMBER">%d</xliff:g> من الأرقام."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"‏يجب ألا يحتوي رمز PIN سوى على أرقام من 0 إلى 9 فقط."</string>
     <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"لا يسمح مشرف الجهاز باستخدام رقم تعريف شخصي تم استخدامه مؤخرًا."</string>
     <string name="lockpassword_illegal_character" msgid="8742901630116866738">"تحتوي كلمة المرور على حرف غير مسموح به."</string>
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"يجب أن تحتوي كلمة المرور على حرف واحد على الأقل."</string>
@@ -441,11 +441,11 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"بلوتوث"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"إدارة الاتصالات، تعيين اسم الجهاز وقابلية الاكتشاف"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"طلب اقتران البلوتوث"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"للإقران مع:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>اكتب رقم التعريف الشخصي المطلوب للجهاز:"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"‏للإقران مع:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>اكتب رمز PIN المطلوب للجهاز:"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"للإقران مع:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>اكتب مفتاح المرور المطلوب للجهاز:"</string>
-    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"يشتمل رقم التعريف الشخصي على أحرف ورموز"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"‏يشتمل رمز PIN على أحرف ورموز"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"0000 أو 1234 عادة"</string>
-    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"قد يلزم أيضًا كتابة رقم التعريف الشخصي هذا على الجهاز الآخر."</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"‏قد يلزم أيضًا كتابة رمز PIN هذا على الجهاز الآخر."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"قد يلزم أيضًا كتابة مفتاح المرور هذا على الجهاز الآخر."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"‏للاقتران مع:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;تأكد من أنه يعرض مفتاح المرور هذا:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"‏من:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;الاقتران مع هذا الجهاز؟"</string>
@@ -512,9 +512,9 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"كهاتف بسماعة خارجية"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"للموسيقى والوسائط"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"تذكّر الإعدادات"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"وحدة العرض اللاسلكية"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"للاطلاع على الأجهزة، شغّل وحدة العرض اللاسلكية."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"‏تم تعطيل وحدة العرض اللاسلكية نظرًا لإيقاف تشغيل شبكة Wi-Fi."</string>
+    <string name="wifi_display_settings_title" msgid="564299108014609382">"وحدة عرض لاسلكية"</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"للاطلاع على الأجهزة، شغّل وحدة عرض لاسلكية."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"‏تم تعطيل وحدة عرض لاسلكية نظرًا لإيقاف تشغيل شبكة Wi-Fi."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"البحث عن وحدات عرض"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"جارٍ البحث..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"لم يتم العثور على وحدات عرض لاسلكية"</string>
@@ -593,7 +593,7 @@
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"‏إعداد Wi-Fi المحمي"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"‏جارٍ بدء WPS…"</string>
     <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"‏اضغط على زر الإعداد المحمي لشبكة Wi-Fi على جهاز التوجيه. قد يكون اسمه \"WPS\" أو قد يحتوي على الرمز التالي:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"‏أدخل رقم التعريف الشخصي <xliff:g id="NUMBER">%1$s</xliff:g> في جهاز توجيه Wi-Fi. يمكن أن يستغرق إكمال الإعداد فترة قد تصل إلى دقيقتين."</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"‏أدخل رمز PIN <xliff:g id="NUMBER">%1$s</xliff:g> في جهاز توجيه Wi-Fi. يمكن أن يستغرق إكمال الإعداد فترة قد تصل إلى دقيقتين."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"‏نجحت عملية WPS. جارٍ الاتصال بالشبكة…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"‏تم الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>."</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"‏إعداد WPS قيد التقدم فعلاً ويمكن أن يستغرق اكتماله فترة قد تصل إلى دقيقتين"</string>
@@ -699,7 +699,7 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"مستوى صوت الرنين"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"اهتزاز عند تشغيل الوضع صامت"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"صوت الإشعار الافتراضي"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"ضوء الإعلام بالنبض"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"ضوء الاشعار بالنبض"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"نغمة الرنين"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"التنبيه"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"استخدام مستوى صوت المكالمة الواردة للإشعارات"</string>
@@ -716,11 +716,11 @@
     <string name="volume_media_description" msgid="7949355934788807863">"الموسيقى والفيديو والألعاب والوسائط الأخرى"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"نغمة الرنين والتنبيهات"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"اشعارات"</string>
-    <string name="volume_alarm_description" msgid="8322615148532654841">"التنبيهات"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"الاشعارات"</string>
     <string name="volume_ring_mute" msgid="3018992671608737202">"كتم صوت نغمة الرنين والإشعارات"</string>
     <string name="volume_media_mute" msgid="3399059928695998166">"كتم صوت الموسيقى والوسائط الأخرى"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"كتم صوت الإشعارات"</string>
-    <string name="volume_alarm_mute" msgid="4452239420351035936">"كتم صوت التنبيهات"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"كتم صوت الاشعارات"</string>
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"اهتزاز عند الرنين"</string>
     <string name="dock_settings" msgid="1820107306693002541">"إرساء"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"إعدادات الإرساء"</string>
@@ -770,23 +770,23 @@
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"‏إعداد تأمين بطاقة SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"‏تأمين بطاقة SIM"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"‏تأمين بطاقة SIM"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"يلزم إدخال رقم التعريف الشخصي لاستخدام الجهاز اللوحي"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"رقم التعريف الشخصي مطلوب لاستخدام الهاتف"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"يلزم إدخال رقم التعريف الشخصي لاستخدام الجهاز اللوحي"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"رقم التعريف الشخصي مطلوب لاستخدام الهاتف"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"‏تغيير رقم التعريف الشخصي لبطاقة SIM"</string>
-    <string name="sim_enter_pin" msgid="6608715137008508432">"‏رقم التعريف الشخصي لبطاقة SIM"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"‏يلزم إدخال رمز PIN لاستخدام الجهاز اللوحي"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"‏رمز PIN مطلوب لاستخدام الهاتف"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"‏يلزم إدخال رمز PIN لاستخدام الجهاز اللوحي"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"‏رمز PIN مطلوب لاستخدام الهاتف"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"‏تغيير رمز PIN لبطاقة SIM"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"‏رمز PIN لبطاقة SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"‏تأمين بطاقة SIM"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"‏إلغاء تأمين بطاقة SIM"</string>
-    <string name="sim_enter_old" msgid="6074196344494634348">"‏رقم التعريف الشخصي القديم لبطاقة SIM"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"‏رمز PIN القديم لبطاقة SIM"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"‏رقم تعريف شخصي جديد لبطاقة SIM"</string>
-    <string name="sim_reenter_new" msgid="3178510434642201544">"أعد كتابة رقم التعريف الشخصي الجديد"</string>
-    <string name="sim_change_pin" msgid="7328607264898359112">"‏رقم التعريف الشخصي لبطاقة SIM"</string>
-    <string name="sim_bad_pin" msgid="2345230873496357977">"رقم التعريف الشخصي غير صحيح"</string>
+    <string name="sim_reenter_new" msgid="3178510434642201544">"‏أعد كتابة رمز PIN الجديد"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"‏رمز PIN لبطاقة SIM"</string>
+    <string name="sim_bad_pin" msgid="2345230873496357977">"‏رمز PIN غير صحيح"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"أرقام التعريف الشخصي غير متطابقة"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"لا يمكن تغيير رقم التعريف الشخصي.\nيحتمل أن يكون رقم التعريف الشخصي غير صحيح."</string>
-    <string name="sim_change_succeeded" msgid="8556135413096489627">"‏تم تغيير رقم التعريف الشخصي لبطاقة SIM بنجاح"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"‏لا يمكن تغيير حالة تأمين بطاقة SIM.\nيحتمل أن يكون رقم التعريف الشخصي غير صحيح."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"‏لا يمكن تغيير رمز PIN.\nيحتمل أن يكون رمز PIN غير صحيح."</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"‏تم تغيير رمز PIN لبطاقة SIM بنجاح"</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"‏لا يمكن تغيير حالة تأمين بطاقة SIM.\nيحتمل أن يكون رمز PIN غير صحيح."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"موافق"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"إلغاء"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"حالة الجهاز اللوحي"</string>
@@ -961,8 +961,8 @@
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"ارسم نقش إلغاء التأمين"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"‏يلزمك رسم نقش إلغاء التأمين للتأكيد على أنك تريد محو وحدة تخزين USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"‏يلزمك رسم نقش إلغاء التأمين للتأكيد على أنك تريد محو وحدة بطاقة SD."</string>
-    <string name="call_settings_title" msgid="5188713413939232801">"إعدادات الاتصال"</string>
-    <string name="call_settings_summary" msgid="7291195704801002886">"إعداد البريد الصوتي، إعادة توجيه الاتصال، انتظار المكالمة، معرف المتصل"</string>
+    <string name="call_settings_title" msgid="5188713413939232801">"اعدادات المكالمات"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"إعداد البريد الصوتي، اعادة توجيه المكالمة، انتظار المكالمة، معرف المتصل"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"‏ربط USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"نقطة اتصال محمولة"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ربط البلوتوث"</string>
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"استخدام عالٍ للبطارية"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"استخدام منخفض للبطارية"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"وضع الموقع"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"‏GPS وشبكات جوّال لتقدير الموقع"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"‏Wi-Fi وشبكة جوال لتقدير الموقع"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"‏استخدام GPS لتحديد موقعك"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"‏استخدام نظام تحديد المواقع العالمي (GPS) وWi‑Fi وشبكات الجوّال لتحديد الموقع"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"‏استخدام Wi-Fi وشبكات الجوّال لتحديد الموقع"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"‏استخدام نظام تحديد المواقع العالمي (GPS) لتحديد موقعك"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"جارٍ الاسترداد…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"‏شبكة Wi-Fi وموقع شبكة الجوّال"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏دع التطبيقات تستخدم خدمة الموقع من Google لتقييم موقعك بشكل أسرع. سيتم جمع بيانات الموقع غير محددة الهوية وإرسالها إلى Google."</string>
@@ -1046,19 +1046,19 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"جارٍ التحميل…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"اختيار كلمة المرور"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"اختيار نقشك"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"اختيار رقم التعريف الشخصي"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"‏اختيار رمز PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"تأكيد كلمة مرورك"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"تأكيد نقشك"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"تأكيد رقم التعريف الشخصي"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"‏تأكيد رمز PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"كلمات المرور غير متطابقة"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"أرقام التعريف الشخصي غير متطابقة"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"تحديد طريقة إلغاء القفل"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"تم تعيين كلمة المرور"</string>
-    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"تم تعيين رقم التعريف الشخصي"</string>
+    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"‏تم تعيين رمز PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"تم تعيين النقش"</string>
     <string name="lock_settings_title" msgid="335025124489630932">"أمان الشاشة"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"تغيير نقش إلغاء التأمين"</string>
-    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"تغيير رقم التعريف الشخصي لإلغاء التأمين"</string>
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"‏تغيير رمز PIN لإلغاء التأمين"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"تأكيد النقش المحفوظ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"أعد المحاولة:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"ارسم نقش إلغاء التأمين"</string>
@@ -2017,12 +2017,12 @@
     <string name="nfc_payment_set_default_instead_of" msgid="3803693771001226795">"هل تريد استخدام <xliff:g id="APP_0">%1$s</xliff:g> بدلاً من <xliff:g id="APP_1">%2$s</xliff:g> دائمًا عند النقر والدفع؟"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"القيود"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"إزالة القيود"</string>
-    <string name="restriction_menu_change_pin" msgid="740081584044302775">"تغيير رقم التعريف الشخصي"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"‏تغيير رمز PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"إظهار الإشعارات"</string>
     <string name="help_label" msgid="1107174367904110532">"مساعدة"</string>
     <string name="user_account_title" msgid="1127193807312271167">"حساب المحتوى"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"معرف الصورة"</string>
-    <string name="cell_broadcast_settings" msgid="8415582011920085222">"عمليات البث الخلوي"</string>
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"بث الشبكة"</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"قيود التطبيقات والمحتوى"</string>
     <string name="user_rename" msgid="8523499513614655279">"إعادة تسمية"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"تعيين قيود التطبيق"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index aed3a70..f230f9a 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1043,11 +1043,11 @@
     <skip />
     <!-- no translation found for location_mode_screen_title (4528716772270246542) -->
     <skip />
-    <!-- no translation found for location_mode_high_accuracy_description (8640231702873607191) -->
+    <!-- no translation found for location_mode_high_accuracy_description (6418936349431602808) -->
     <skip />
-    <!-- no translation found for location_mode_battery_saving_description (7110846007772128971) -->
+    <!-- no translation found for location_mode_battery_saving_description (1728668969743485109) -->
     <skip />
-    <!-- no translation found for location_mode_sensors_only_description (3103917665724654860) -->
+    <!-- no translation found for location_mode_sensors_only_description (7178415350457794366) -->
     <skip />
     <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
     <skip />
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index e188aef..1f5ffd1 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Висок разход на батерията"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Нисък разход на батерията"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим за местоположението"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Прибл. устан. на местопол. чрез GPS, Wi‑Fi и моб. мрежи"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Прибл. устан. на местопол. чрез Wi‑Fi и моб. мрежи"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Посочване на местопол. чрез GPS"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Използване на GPS, Wi‑Fi и мобилни мрежи за установяване на местоположението"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Използване на Wi‑Fi и мобилни мрежи за установяване на местоположението"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Използване на GPS за установяване на местоположението ви"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Извлича се…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Mестоп. от Wi‑Fi и моб. мрежа"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Прилож. да ползват услугата ни за местоп., за да прогнозират по-бързо вашето. Анонимни данни за местоп. ще се събират и изпращат на Google."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 43f7eb0..93d1de8 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Ús de bateria elevat"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Ús de bateria reduït"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode d\'ubicació"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Calcula ubicació amb Wi-Fi i xarxes mòbils"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Calcula ubicació amb Wi-Fi i xarxes mòbils"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Determina ubicació amb GPS"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Fa servir el GPS, la Wi-Fi i les xarxes mòbils per calcular la ubicació."</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Fa servir la Wi-Fi i les xarxes mòbils per calcular la ubicació."</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Fa servir el GPS per calcular la ubicació."</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"S\'està recuperant..."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Ubicació p. Wi-Fi i xarxa mòb."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permet que les aplicacions utilitzin el servei d\'ubicació de Google per calcular la teva ubicació més ràpidament. Es recopilaran dades d\'ubicació anònimes i s\'enviaran a Google."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 008f170..bcd4382 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Vysoké využívání baterie"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Nízké využívání baterie"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Režim určování polohy"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"K určení polohy použít GPS, Wi-Fi a mobilní síť"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"K určení polohy použít Wi-Fi a mobilní síť"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"K určení polohy použít GPS"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"K určení polohy použít GPS, Wi-Fi a mobilní sítě"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"K určení polohy použít Wi-Fi a mobilní sítě"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"K určení polohy použít GPS"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Načítání…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Poloha Wi-Fi a mobilní sítě"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Povolit aplikacím používat službu určování polohy Google a rychleji odhadovat vaši polohu. Anonymní data budou sbírána a odesílána Googlu."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 58d83e7..6055a71 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Højt batteriforbrug"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Lavt batteriforbrug"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Placeringstilstand"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Beregn placering med GPS, Wi-Fi og mobilnetværk"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Beregn placering med Wi-Fi og mobilnetværk"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Find din placering med GPS"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Brug GPS-signal, Wi-Fi- og mobilnetværk til at fastlægge placering"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Brug Wi-Fi- og mobilnetværk til at fastlægge placering"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Brug GPS-signal til at fastlægge din placering"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Henter..."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Placering af Wi-Fi- og mobilnet."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Tillad, at apps bruger Googles placeringstjeneste til at beregne din placering hurtigere. Der indsamles anonyme placeringsdata, som sendes til Google."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0cb4c35..6e8d15c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1002,7 +1002,7 @@
     <string name="location_title" msgid="1029961368397484576">"Mein Standort"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hohe Genauigkeit"</string>
-    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Stromsparfunktion"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Energiesparmodus"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Nur Gerät"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Standort aus"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Letzte Standortanfragen"</string>
@@ -1011,9 +1011,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Hoher Akkuverbrauch"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Geringer Akkuverbrauch"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Standortmodus"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS/WLAN/Mobilfunknetz für ungefähren Standort nutzen"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"WLAN/Mobilfunknetz für ungefähren Standort nutzen"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"GPS für Standort verwenden"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"GPS/WLAN/Mobilfunknetz zur Standortbestimmung nutzen"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"WLAN/Mobilfunknetz zur Standortbestimmung nutzen"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"GPS zur Standortbestimmung nutzen"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Daten werden abgerufen…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"WLAN- &amp; Mobilfunknetz-Standort"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Apps dürfen meinen Standort mit dem Google-Standortdienst schneller bestimmen. Anonyme Standortdaten werden erfasst und an Google gesendet."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8dbacda..ce86c84 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Υψηλή χρήση μπαταρίας"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Χαμηλή χρήση μπαταρίας"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Λειτουργία τοποθεσίας"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Χρήση GPS, Wi‑Fi και δικτ.κιν.τηλ. για υπολ.τοποθ."</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Χρήση Wi‑Fi και δικτύων κιν.τηλ. για υπολ.τοποθ."</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Χρήση GPS για τοποθεσία"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Χρήση GPS, Wi‑Fi και δικτύων κινητής τηλεφωνίας για τον καθορισμό της τοποθεσίας"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Χρήση Wi‑Fi και δικτύων κινητής τηλεφωνίας για τον καθορισμό της τοποθεσίας"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Χρήση του GPS για τον καθορισμό της τοποθεσίας σας"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Ανάκτηση…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Τοποθεσία Wi‑Fi και δικτύων κιν. τηλεφ."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν την υπηρεσία τοποθεσίας της Google για γρήγορη εκτίμηση της τοποθεσίας σας. Θα συλλεχθούν ανώνυμα δεδομένα και θα αποσταλούν στην Google."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index a77e27c..a08429c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"High battery use"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Low battery use"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Location mode"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Use GPS, Wi‑Fi and mobile networks to estimate location"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Use Wi‑Fi and mobile networks to estimate location"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Use GPS to pinpoint your location"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Use GPS, Wi‑Fi and mobile networks to determine location"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Use Wi‑Fi and mobile networks to determine location"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Use GPS to determine your location"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Retrieving…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi‑Fi &amp; mobile network location"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Let apps use Google\'s location service to estimate your location faster. Anonymous location data will be collected and sent to Google."</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index a77e27c..a08429c 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"High battery use"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Low battery use"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Location mode"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Use GPS, Wi‑Fi and mobile networks to estimate location"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Use Wi‑Fi and mobile networks to estimate location"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Use GPS to pinpoint your location"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Use GPS, Wi‑Fi and mobile networks to determine location"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Use Wi‑Fi and mobile networks to determine location"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Use GPS to determine your location"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Retrieving…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi‑Fi &amp; mobile network location"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Let apps use Google\'s location service to estimate your location faster. Anonymous location data will be collected and sent to Google."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b1a757f..452fc0e 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Uso de batería alto"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Uso de batería bajo"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de ubicación"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Ubicar con GPS/Wi-Fi/red móvil"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Ubicar con Wi‑Fi y red móvil"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Ubicar con GPS"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Determinar ubicación con GPS, Wi‑Fi y redes móviles"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Determinar ubicación con Wi‑Fi y redes móviles"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Determinar ubicación con GPS"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Recuperando…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Ubicación de Wi-Fi y red móvil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación (se enviarán datos anónimos a Google)"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b0cfa99..9baf3eb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Uso de batería elevado"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Poco uso de batería"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de ubicación"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Calcular ubicación con GPS, Wi‑Fi y redes móviles"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Calcular ubicación con Wi‑Fi y redes móviles"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Determinar ubicación con GPS"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Determinar ubicación con GPS, Wi‑Fi y redes móviles"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Determinar ubicación con Wi‑Fi y redes móviles"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Determinar ubicación con GPS"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Recuperando…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Ubicación por red móvil y Wi‑Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que las aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación más rápido. Se recopilarán datos de ubicación anónimos y se enviarán a Google"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index c211ba9..738b135 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Suur akukasutus"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Väike akukasutus"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Asukoharežiim"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Asukoha määramine GPS-i, WiFi ja mobiilsidevõrgu abil"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Asukoha määramine WiFi ja mobiilsidevõrgu abil"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Asukoha määramine GPS-iga"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Asukoha määramine GPS-i, WiFi- ja mobiilsidevõrgu abil"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Asukoha määramine WiFi- ja mobiilsidevõrgu abil"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Asukoha määramine GPS-i abil"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Toomine …"</string>
     <string name="location_network_based" msgid="9134175479520582215">"WiFi/mobiilsidevõrgu asukoht"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Lubage rakendustel kasutada Google\'i asukohateenust, et asukohta kiiremini määrata. Kogutud anonüümsed asukohaandmed saadetakse Google\'ile."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 549b984..b27d0f2 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"استفاده زیاد از باتری"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"استفاده کم از باتری"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"حالت مکان"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"‏استفاده از GPS،‏ Wi-Fi و شبکه همراه برای تخمین مکان"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"‏استفاده از Wi-Fi و شبکه همراه برای تخمین مکان"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"‏استفاده از GPS برای تعیین دقیق مکان‌ شما"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"‏استفاده از GPS،‏ شبکه‌های تلفن همراه و Wi-Fi برای تعیین مکان"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"‏استفاده از شبکه‌های تلفن همراه و Wi-Fi برای تعیین مکان"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"‏استفاده از GPS برای تعیین مکان شما"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"در حال بازیابی..."</string>
     <string name="location_network_based" msgid="9134175479520582215">"‏مکان شبکه تلفن همراه و Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏به برنامه‌ها اجازه داده شود با استفاده از خدمات مکانی Google مکان شما را سریع‌تر تخمین بزنند. داده‌های مکان به‌طور ناشناس جمع‌آوری شده و به Google ارسال خواهد شد."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index a7c6948..85f2f94 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Suuri akun kulutus"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Vähäinen akun kulutus"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Paikannustila"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Paikanna GPS:n ja wifi- ja mobiiliverkkojen avulla"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Paikanna wifi- ja mobiiliverkkojen avulla"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Paikanna sijainti GPS:n avulla"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Paikanna GPS:n ja wifi- ja mobiiliverkkojen avulla"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Paikanna wifi- ja mobiiliverkkojen avulla"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Paikanna GPS:n avulla"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Haetaan…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wifi- ja mobiiliverkkosijainti"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Anna sovellusten arvioida sijaintisi Googlen sijaintipalvelulla. Anonyymejä sijaintitietoja kerätään ja lähetetään Googlelle."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 8af5622..e7ff78d 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Forte utilisation de la pile"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Faible utilisation de la pile"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode de localisation"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Util. GPS+Wi-Fi+cell. pour estimer pos."</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Util. rés. Wi-Fi+cell. pour estimer pos."</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Utiliser GPS pour local. pos."</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Utiliser le GPS en conjonction avec les réseaux cellulaires et Wi-Fi pour déterminer la position"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Utiliser les réseaux Wi-Fi et cellulaires pour déterminer la position"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Utiliser le GPS pour déterminer la position"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Récupération en cours…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Localis. via Wi-Fi et réseau mob."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Autoriser applis à utiliser localisation Google pour estimer position plus rapidement. Infos localisation anonymes envoyées à Google."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 17bb52b..1166692 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Forte utilisation de la batterie"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Faible utilisation de batterie"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode de localisation"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Utilis. GPS, réseaux Wi-Fi et mob. pour estimer position"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Utilis. réseaux Wi-Fi et mob. pour estimer position"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Utiliser GPS pour vous localiser"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Utiliser le GPS, ainsi que les réseaux mobiles et Wi-Fi pour déterminer la position"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Utiliser les réseaux mobiles et Wi-Fi pour déterminer la position"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Utiliser le GPS pour déterminer la position"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Récupération des données en cours…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Localis. via Wi-Fi et réseaux mobiles"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Autoriser applis à utiliser localisation Google pour estimer position plus rapidement. Infos localisation anonymes envoyées à Google."</string>
@@ -1077,7 +1077,7 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Dessiner un schéma pour déverrouiller l\'écran"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Faire apparaître le schéma"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrer au toucher"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Verr. auto MARCHE-ARRÊT"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Verr. auto marche-arrêt"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Créer un schéma"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Modifier le schéma de déverrouillage"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Comment dessiner un schéma de déverrouillage :"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 9237ffa..db0846d 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"अधिक बैटरी उपयोग"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"कम बैटरी उपयोग"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"स्थान के अनुमान हेतु GPS, Wi-Fi व मोबाइल नेटवर्क का उपयोग करें"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"स्थान के अनुमान हेतु Wi-Fi व मोबाइल नेटवर्क का उपयोग करें"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"अपना स्थान बताने हेतु GPS उपयोग करें"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"स्थान निर्धारित करने के लिए GPS, Wi-Fi, और मोबाइल नेटवर्क का उपयोग करें"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"स्थान निर्धारित करने के लिए Wi-Fi और मोबाइल नेटवर्क का उपयोग करें"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"अपना स्थान निर्धारित करने के लिए GPS का उपयोग करें"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"पुनर्प्राप्त किया जा रहा है…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi और मोबाइल नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"आपके स्थान का तेज़ अनुमान लगाने हेतु, एप्लि. को Google की स्थानीय सेवा का उपयोग करने दें. अज्ञात स्थानीय डेटा एकत्रित करके Google को भेजा जाएगा."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 27a954a..a248828 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Visoka potrošnja baterije"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Niska potrošnja baterije"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Način lokacije"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Upotrebljavaj GPS, Wi‑Fi i mobilne mreže za procjenu lokacije"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Upotrebljavaj Wi‑Fi i mobilne mreže za procjenu lokacije"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Upotrebljavaj GPS za određivanje lokacije"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Za određivanje lokacije upotrebljavaju se GPS, Wi‑Fi i mobilne mreže"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Za određivanje lokacije upotrebljavaju se Wi‑Fi i mobilne mreže"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Za određivanje lokacije upotrebljava se GPS"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Dohvaćanje…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Lokacija Wi-Fi i mob. mreža"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Omogućite aplik. da upotrebljavaju Googleovu uslugu lokacije za brže lociranje. Anonimni podaci prikupljat će se i slati Googleu."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 9d44447..76efb9a 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Magas akkumulátorhasználat"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Alacsony akkumulátorhasználat"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Helymeghatározási mód"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS/Wi-Fi/mobil helybecsléshez"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Wi-Fi/mobilhál. helybecsléshez"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Hely meghatározása GPS-szel"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"GPS, Wi-Fi és mobilhálózatok használata a tartózkodási hely meghatározásához"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Wi-Fi és mobilhálózatok használata a tartózkodási hely meghatározásához."</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"GPS használata a tartózkodási hely meghatározásához"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Lekérés…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Hely Wi-Fi és mobilhálózat alapján"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Engedélyezze az alkalmazásoknak, hogy a Google helymeghatározó szolgáltatásával gyorsabban megbecsüljék tartózkodási helyét. A névtelen helyadatok összegyűjtés után a Google-hoz kerülnek."</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index c97ff3e..81e6ccc 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Մարտկոցի շատ օգտագործում"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Մարտկոցի քիչ օգտագործում"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Տեղադրության ռեժիմ"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Օգտագործել GPS, Wi-Fi և բջջային ցանցերը՝ դիրքը տեղորոշելու համար"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Օգտագործել Wi-Fi և բջջային ցանցերը՝ դիրքը տեղորոշելու համար"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Օգտագործեք GPS՝ ձեր դիրքը տեղորոշելու համար"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Օգտագործել GPS, Wi-Fi և բջջային ցանցերը՝ դիրքը տեղորոշելու համար"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Օգտագործել Wi-Fi և բջջային ցանցերը՝ դիրքը տեղորոշելու համար"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Օգտագործել GPS՝ դիրքը տեղորոշելու համար"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Առբերվում է..."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi‑Fi &amp; շարժական ցանցի տեղադրություն"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Թույլատրել ծրագրերին օգտագործել Google-ի տեղակայման ծառայությունները` ձեր տեղադրությունը ավելի արագ որոշելու համար: Անանուն տեղակայման տվյալները կհավաքագրվեն և կուղարկվեն Google-ին:"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 233d49d..e0ec5a6 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Penggunaan baterai tinggi"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Penggunaan baterai rendah"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode lokasi"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Perkiraan lokasi pakai GPS, Wi‑Fi &amp; data seluler"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Perkiraan lokasi pakai Wi‑Fi &amp; data seluler"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Penentuan lokasi pakai GPS"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Gunakan GPS, Wi‑Fi, dan jaringan seluler untuk menentukan lokasi"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Gunakan Wi‑Fi dan jaringan seluler untuk menentukan lokasi"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Gunakan GPS untuk menentukan lokasi Anda"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Mengambil..."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Lokasi Wi-Fi &amp; seluler"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Izinkan aplikasi menggunakan layanan lokasi Google untuk memperkirakan lokasi Anda dengan lebih cepat. Data lokasi anonim akan dikumpulkan dan dikirim ke Google."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e3e1b68..f8bb811 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Elevato utilizzo della batteria"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Basso utilizzo della batteria"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modalità di geolocalizzazione"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Reti GPS, Wi-Fi e mobili per la stima della posizione"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Reti Wi-Fi e mobili per la stima della posizione"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Usa GPS per individuare la posizione"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Usa reti GPS, Wi-Fi e mobili per stabilire la posizione"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Usa reti Wi-Fi e mobili per stabilire la posizione"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Usa GPS per stabilire la posizione"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Recupero…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Posizione Wi‑Fi e rete mobile"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Consenti alle app di usare localizzazione Google per stabilire la tua posizione. Saranno raccolti e inviati a Google dati anonimi."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 5cd6610..0550b1f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"שימוש בסוללה מלאה"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"שימוש בסוללה חלשה"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"מצב מיקום"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"‏מיקום עם GPS‏, Wi-Fi ורשתות"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"‏מיקום עם Wi-Fi ורשתות לנייד"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"‏השתמש ב-GPS למיקום מדויק"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"‏השתמש ב-GPS‏, Wi-Fi ורשתות לנייד לקביעת המיקום"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"‏השתמש ב-Wi-Fi ורשתות לנייד לקביעת המיקום"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"‏השתמש ב-GPS לקביעת המיקום"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"מאחזר…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"‏מיקום רשת Wi-Fi ורשת לנייד"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏אפשר לאפליקציות להשתמש בשירות המיקום של Google כדי להעריך את מיקומך מהר יותר. נתוני מיקום אנונימיים ייאספו ויישלחו אל Google."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ab09f6e..3d93794 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1012,9 +1012,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"高い電池使用量"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"低い電池使用量"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"位置情報モード"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS、Wi‑Fi、モバイルネットワークで現在地を推定する"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Wi‑Fiとモバイルネットワークで現在地を推定する"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"GPSで現在地を特定する"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"GPS、Wi‑Fi、モバイルネットワークで現在地を特定する"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Wi‑Fiとモバイルネットワークで現在地を特定する"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"GPSで現在地を特定する"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"取得しています…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi/モバイル接続時の位置情報"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Googleの位置情報サービスで現在地をすばやく推定することをアプリに許可します。匿名の現在地データが収集され、Googleに送信されます。"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 20755e4..8a3ebfa 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"მძლავრი ბატარეა"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"სუსტი ბატარეა"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"მდებარეობის რეჟიმი"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"მდებარეობის დასადგენად, GPS, Wi‑Fi და მობილური ქსელების გამოყენება"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"მდებარეობის დასადგენად Wi‑Fi და მობილური ქსელების გამოყენება"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"თქვენი ზუსტი მდებარეობის დასადგენად GPS-ის გამოყენება"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"მდებარეობის დასადგენად, GPS, Wi‑Fi და მობილური ქსელების გამოყენება"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"მდებარეობის დასადგენად Wi‑Fi და მობილური ქსელების გამოყენება"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"თქვენი მდებარეობის დასადგენად GPS-ის გამოყენება"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"მოძიება…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi‑Fi &amp; მობილური ქსელის მდებარეობა"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"თქვენი ადგილმდებარეობის უფრო სწრაფად დასადგენად დართეთ აპებს ნება, გამოიყენონ Google-ის მდებარეობის სერვისი. ანონიმური მდებარეობის მომაცემები შეგროვდება და გაეგზავნება Google-ს."</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 61c56b3..f2cf09d 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"ការ​ប្រើ​ប្រាស់​ថ្ម​​​ខ្លាំង"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"ការ​ប្រើប្រាស់​ជិត​អស់​ថ្ម"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"របៀបកំណត់​ទីតាំង"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"ប្រើ GPS, ហ្វាយវ៉ាយ និង​​បណ្ដាញ​​ចល័ត​ដើម្បី​ប៉ាន់ស្មាន​ទីតាំង"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"ប្រើ​ហ្វាយវ៉ាយ ​និង​​បណ្ដាញ​​ចល័ត ​ដើម្បី​​ប៉ាន់ស្មាន​​ទីតាំង"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"ប្រើ GPS ដើម្បី​ដៅ​ទីតាំង​របស់​អ្នក"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"ប្រើជីភីអេស, ហ្វាយវ៉ាយ និង​​បណ្ដាញ​​ចល័ត​ដើម្បី​កំណត់​ទីតាំង"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"ប្រើ​ហ្វាយវ៉ាយ ​និង​​បណ្ដាញ​​ចល័ត​ដើម្បី​​កំណត់​​ទីតាំង"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"ប្រើ​ជីភីអេស ដើម្បី​កំណត់​ទីតាំង​របស់​អ្នក"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"កំពុង​ទៅ​យក..."</string>
     <string name="location_network_based" msgid="9134175479520582215">"វ៉ាយហ្វាយ &amp; ទីតាំង​បណ្ដាញ​ចល័ត"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ឲ្យ​កម្មវិធី​ប្រើ​សេវាកម្ម​ទីតាំង​របស់ Google ដើម្បី​ស្មាន​ទីតាំង​របស់​អ្នក​កាន់តែ​លឿន។ ទិន្នន័យ​ទីតាំង​អនាមិក​នឹង​ត្រូវ​បាន​ប្រមូល​ រួច​ផ្ញើ​ទៅ Google ។"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5049997..695b242 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"배터리 사용량 많음"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"배터리 사용량 적음"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"위치 모드"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS, Wi‑Fi 및 모바일 네트워크를 사용하여 위치를 예측합니다."</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Wi‑Fi 및 모바일 네트워크를 사용하여 위치를 예측합니다."</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"GPS를 사용하여 현재 위치를 정확하게 찾습니다."</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"GPS, Wi‑Fi, 모바일 네트워크를 사용하여 위치를 찾습니다."</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Wi‑Fi 및 모바일 네트워크를 사용하여 위치를 찾습니다."</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"GPS를 사용하여 내 위치를 찾습니다."</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"검색 중…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi 및 모바일 네트워크 위치"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"사용자의 위치를 빠르게 파악하도록 앱에서 Google의 위치 서비스를 사용합니다. 익명의 위치 정보가 수집되어 Google로 전송됩니다."</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index f9952f1..14a5e06 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"ໃຊ້ແບັດເຕີຣີ່ຫຼາຍ"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"ໃຊ້ແບັດເຕີຣີ່ໜ້ອຍ"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ໂຫມດຂໍ້ມູນສະຖານທີ່"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"ນຳໃຊ້ GPS, Wi-Fi ແລະເຄືອຂ່າຍໂທລະສັບເພື່ອຄາດເດົາຂໍ້ມູນສະຖານທີ່."</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"ໃຊ້ Wi-Fi ແລະເຄືອຂ່າຍໂທລະສັບເພື່ອຄາດເດົາຂໍ້ມູນສະຖານທີ່."</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"ນຳໃຊ້ GPS ເພື່ອລະບຸຂໍ້ມູນສະຖານທີ່ຂອງທ່ານ"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"ນຳໃຊ້ GPS, Wi-Fi ແລະເຄືອຂ່າຍໂທລະສັບເພື່ອລະບຸຂໍ້ມູນສະຖານທີ່"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"ໃຊ້ Wi-Fi ແລະເຄືອຂ່າຍໂທລະສັບເພື່ອລະບຸຂໍ້ມູນສະຖານທີ່"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"ນຳໃຊ້ GPS ເພື່ອລະບຸຂໍ້ມູນສະຖານທີ່ຂອງທ່ານ"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"ກຳລັງດຶງຂໍ້ມູນ..."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi &amp; ສະຖານທີ່ເຄືອຂ່າຍມືຖື"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ໃຫ້ແອັບຯຕ່າງໆໃຊ້ບໍລິການສະຖານທີ່ຂອງ Google ເພື່ອປະເມີນສະຖານທີ່ຂອງທ່ານໄດ້ໄວຂຶ້ນ. ຂໍ້ມູນສະຖານທີ່ທີ່ບໍ່ລະບຸໂຕຕົນຈະຖືກເກັບກຳ ແລະສົ່ງໃຫ້ Google."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 6c444db..4b797d8 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Naudoja daug akum. energijos"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Naudoja mažai akum. energijos"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Vietovės režimas"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Vietą nust. su GPS, „Wi‑Fi“ ir mob. tinklu"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Vietą nust. su „Wi‑Fi“ ir mob. tinklu"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Naudoti GPS vietovei nurodyti"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Vietovę nustatyti naudojant GPS, „Wi‑Fi“ ir mobiliojo ryšio tinklus"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Vietovę nustatyti naudojant „Wi‑Fi“ ir mobiliojo ryšio tinklus"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Vietovę nustatyti naudojant GPS"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Nuskaitoma…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"„Wi-Fi“ ir mob. tinklo vietovė"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Leisti programoms naud. „Google“ viet. pasl., kad viet. būtų nustatoma greičiau. Anonim. viet. duom. bus renk. ir siunč. „Google“."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index dd5d708..2015d47 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Augsts akumulatora patēriņš"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Zems akumulatora patēriņš"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Atrašanās vietas režīms"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Lietot GPS, Wi‑Fi un mob. tīklus vietas noteikšanai"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Lietot Wi‑Fi un mob. tīklus vietas noteikšanai"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Lietot GPS vietas noteikšanai"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Lietot GPS, Wi‑Fi un mobilo sakaru tīklus atrašanās vietas noteikšanai"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Lietot Wi‑Fi un mobilo sakaru tīklus atrašanās vietas noteikšanai"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Lietot GPS atrašanās vietas noteikšanai"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Notiek izgūšana…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi un mob. tīklu atr. vieta"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ļaut lietotnēm izmantot Google atrašanās vietas pakalpojumu, lai ātrāk noteiktu jūsu atrašanās vietu. Tiks apkopoti un nosūtīti uz Google serveriem anonīmi atrašanās vietas dati."</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 2fb56ba..f451c2a 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Батерейны зарцуулалт өндөр"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Батерейны зарцуулалт бага"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Байршлын горим"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Байршлыг тооцоолохын тулд Wi‑Fi болон мобайл сүлжээг ашиглах"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Байршлыг тооцоолохын тулд Wi‑Fi болон мобайл сүлжээг ашиглах"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Өөрийн байршлыг заахын тулд GPS ашиглах"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Байршлыг тооцоолохын тулд Wi‑Fi болон мобайл сүлжээг ашиглах"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Байршлыг тооцоолохын тулд Wi‑Fi болон мобайл сүлжээг ашиглах"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Өөрийн байршлыг тодорхойлохын тулд GPS ашиглах"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Дуудаж байна…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi &amp; мобайл сүлжээний байршил"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Апп-уудад Google-н байршлын үйлчилгээ ашиглан таны байршлыг хурдан олохыг зөвшөөрөх. Нэргүй байршлын мэдээлэл цуглуулагдаж Google рүү илгээгдэх болно."</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 6105413..e6187d2 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Penggunaan bateri tinggi"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Penggunaan bateri rendah"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mod lokasi"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Anggar lokasi dgn GPS,  Wi-Fi"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Guna Wi-Fi untuk anggar lokasi"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Tentukan lokasi dengan GPS"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Gunakan GPS, Wi-Fi dan rangkaian mudah alih untuk menentukan lokasi"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Gunakan Wi-Fi dan rangkaian mudah alih untuk menentukan lokasi"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Gunakan GPS untuk menentukan lokasi anda"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Mengambil…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Lokasi Wi-Fi &amp; rangkaian mudah alih"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Biar apl guna perkhidmatan lokasi Google utk anggar lokasi lebih cepat. Data lokasi tanpa nama dikumpul dan dihantar kpd Google."</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 84f800f..20f4c46 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Høy batteribruk"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Lavt batteribruk"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Posisjonsmodus"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Bruk GPS, Wi-Fi og mobilnettverk til å anslå plassering"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Bruk Wi-Fi og mobilnettverk for å anslå plassering"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Bruk GPS for å finne posisjonen din"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Bruk GPS, Wi-Fi og mobilnettverk til å fastslå posisjon"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Bruk Wi-Fi og mobilnettverk til å fastslå posisjon"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Bruk GPS til å fastslå posisjonen din"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Henter …"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi- og mobilnettverksposisjon"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Tillat at apper bruker posisjonstjenesten fra Google til å finne posisjonen din raskere. Anonym posisjonsdata blir samlet inn og sendt til Google."</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 574a19e..824df76 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Hoog accugebruik"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Laag accugebruik"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Locatiemodus"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS, wifi en mobiele netwerken gebruiken om locatie te schatten"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Wifi en mobiele netwerken gebruiken om locatie te schatten"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"GPS gebruiken om uw locatie te bepalen"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"GPS, wifi en mobiele netwerken gebruiken om locatie te bepalen"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Wifi en mobiele netwerken gebruiken om locatie te bepalen"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"GPS gebruiken om uw locatie te bepalen"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Ophalen…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wifi en mobiele netwerklocatie"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Apps toestaan de locatieservice van Google te gebruiken om uw locatie sneller te schatten. Anonieme locatiegegevens worden verzameld en verzonden naar Google."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 54718fe..f2386e5 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Wysokie użycie baterii"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Niskie użycie baterii"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Tryb lokalizacji"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Określaj lokalizację przez GPS, Wi-Fi i sieci komórkowe"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Określaj lokalizację przez Wi-Fi i sieci komórkowe"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Określaj dokładną lokalizację za pomocą GPS"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Określaj lokalizację przez GPS, Wi-Fi i sieci komórkowe"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Określaj lokalizację przez Wi-Fi i sieci komórkowe"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Określaj lokalizację przez GPS"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Pobieram…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Przez Wi-Fi i sieć komórkową"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Zezwalaj aplikacjom na używanie usługi lokalizacji Google do szybszego określania Twojego położenia. Anonimowe dane o lokalizacji będą zbierane i przesyłane do Google."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 56dbb11..1d8f452 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Utilização de bateria elevada"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Utilização de bateria baixa"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Utilizar redes móveis, Wi-Fi e GPS p/ calcular a local."</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Utilizar redes móveis e Wi-Fi p/ calcular a local."</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Utilizar GPS p/ ident. local."</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Utilizar redes móveis, Wi-Fi e GPS para determinar localização"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Utilizar redes móveis e Wi-Fi para determinar localização"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Utilizar GPS para determinar a sua localização"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"A obter…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi e localização de rede de telemóvel"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que aplic. usem o serv. localiz. Google p/ calcular mais rapida/ a sua localização. Dados localização recolhidos e enviados à Google."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e006097..1098004 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Uso da bateria elevado"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Uso da bateria reduzido"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Usar GPS, Wi‑Fi e redes móveis p/ estimar a localização"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Usar Wi‑Fi e redes móveis p/ estimar a localização"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Usar GPS p/ determinar o local"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Usar GPS, Wi‑Fi e redes móveis para determinar a localização"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Usar Wi‑Fi e redes móveis para determinar a localização"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Usar GPS para determinar a localização"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Recuperando…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Local de rede móvel e Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que os aplicativos usem o serviço de localização do Google para determinar seu local mais rapidamente. Dados de localização anônimos serão coletados e enviados ao Google."</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index b505d06..7972aee 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -1559,11 +1559,11 @@
     <skip />
     <!-- no translation found for location_mode_screen_title (4528716772270246542) -->
     <skip />
-    <!-- no translation found for location_mode_high_accuracy_description (8640231702873607191) -->
+    <!-- no translation found for location_mode_high_accuracy_description (6418936349431602808) -->
     <skip />
-    <!-- no translation found for location_mode_battery_saving_description (7110846007772128971) -->
+    <!-- no translation found for location_mode_battery_saving_description (1728668969743485109) -->
     <skip />
-    <!-- no translation found for location_mode_sensors_only_description (3103917665724654860) -->
+    <!-- no translation found for location_mode_sensors_only_description (7178415350457794366) -->
     <skip />
     <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
     <skip />
@@ -3360,9 +3360,7 @@
     <skip />
     <!-- no translation found for wizard_finish (3286109692700083252) -->
     <skip />
-    <!-- no translation found for user_image_take_photo (1280274310152803669) -->
-    <!-- no translation found for user_image_take_photo (7496128293167402354) -->
-    <skip />
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Far ina foto"</string>
     <!-- no translation found for user_image_choose_photo (7940990613897477057) -->
     <!-- no translation found for user_image_choose_photo (3746334626214970837) -->
     <skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index e2d11c9..ff12d11 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Utilizarea intensă a bateriei"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Utilizarea redusă a bateriei"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mod de localizare"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Utiliz. rețele Wi-Fi și mobile pt. locația aprox."</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Utiliz. rețele Wi-Fi și mobile pt. locația aprox."</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Utiliz. GPS pt. a indica loc. dvs"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Utilizarea GPS-ului, rețelelor Wi-Fi și mobile pentru determinarea locației"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Utilizarea rețelelor Wi-Fi și mobile pentru determinarea locației"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Utilizarea GPS-ului pentru determinarea locației"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Se efectuează preluarea…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Localizare prin Wi-Fi și mobil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Aplicaţiile estimează mai rapid locaţia cu serviciul de localizare Google. Se colectează/trimit la Google date anonime de localizare."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 031413a..c4fe7bb 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Высокий расход заряда батареи"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Низкий расход заряда батареи"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим местоположения"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Для определения местоположения используются GPS, Wi‑Fi и мобильные сети"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Для определения местоположения используются Wi‑Fi и мобильные сети"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Для определения местоположения используется GPS"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Использовать GPS, Wi‑Fi и мобильные сети для определения местоположения"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Использовать Wi‑Fi и мобильные сети для определения местоположения"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Использовать GPS для определения местоположения"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Получение…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"По координатам сети"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Разрешить отправлять анонимные геоданные и позволить приложениям определять ваше местоположение с помощью Wi-Fi и мобильных сетей"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 9c1c8f3..cfb7d96 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Vysoká spotreba batérie"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Nízka spotreba batérie"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Režim určovania polohy"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Odhadovať polohu pomocou systému GPS, siete Wi-Fi a mobilných sietí"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Odhadovať polohu pomocou siete Wi-Fi a mobilných sietí"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Na presné určenie polohy použiť systém GPS"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Určovať polohu pomocou systému GPS, siete Wi-Fi a mobilných sietí"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Určovať polohu pomocou siete Wi-Fi a mobilných sietí"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Určovať polohu pomocou systému GPS"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Načítava sa..."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Poloha Wi-Fi a mobilnej siete"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Povoliť apl. používať službu urč. polohy Google a rýchl. odhad. vašu polohu. Anonym. údaje o polohe sa budú odosielať spol. Google."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index d577ed7..5dbeae2 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Visoka poraba akumulatorja"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Nizka poraba akumulatorja"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Način za lokacijo"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Uporaba GPS-a, Wi-Fi-ja in mobilnih omrežij za oceno lokacije"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Uporaba Wi-Fi-ja in mobilnih omrežij za oceno lokacije"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Uporaba GPS-a za oceno vaše lokacije"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Uporaba GPS-a, Wi-Fi-ja in mobilnih omrežij za določanje lokacije"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Uporaba Wi-Fi-ja in mobilnih omrežij za določanje lokacije"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Uporaba GPS-a za določanje lokacije"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Prenašanje …"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Lokacija Wi-Fi-ja in mob. omr."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Aplikacijam omogočite hitrejše določanje lokacije z Googlovo storitvijo za določanje lokacije. Anonimni podatki o lokaciji bodo zbrani in poslani Googlu."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e6b7673..ae55c8d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Велика искоришћеност батерије"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Мала искоришћеност батерије"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим локације"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS, Wi‑Fi и мобилне мреже за приближну локацију"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Wi‑Fi и мобилне мреже за приближну локацију"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"GPS за тачну локацију"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Користите GPS, Wi‑Fi и мобилне мреже за одређивање локације"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Користите Wi‑Fi и мобилне мреже за одређивање локације"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Користите GPS за одређивање локације"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Преузимање…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Локац. на основу Wi-Fi и моб. мреже"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Нека апл. користе Google-ову услугу лоцирања за брже одређивање локације. Анонимни подаци о локацији прикупљаће се и слати Google-у."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 29e39a3..f98ac59 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Hög batterianvändning"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Låg batterianvändning"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Platsläge"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS, Wi-Fi och mobila nätverk"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Med Wi-Fi och mobila nätverk"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Hitta din plats med GPS"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Ange plats med hjälp av GPS, Wi-Fi och mobila nätverk"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Ange plats med hjälp av Wi-Fi och mobila nätverk"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Ange plats med hjälp av GPS"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Hämtar …"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Plats från Wi-Fi/mobilnätverk"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ge appar möjlighet att snabbare se var du är med Googles platstjänst. Anonym platsinformation samlas in och skickas till Google."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index be81ffc..5ee6300 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -676,7 +676,7 @@
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Sambaza intaneti ya Wi-Fi"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Inawezesha mtandao-hewa…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Inazima intaneti..."</string>
-    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Mtandao-hewa unaobebwa wa <xliff:g id="NETWORK_SSID">%1$s</xliff:g> unafanya kazi"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Intaneti ya kusambazwa ya <xliff:g id="NETWORK_SSID">%1$s</xliff:g> inafanya kazi"</string>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Hitilafu katika kusambaza intaneti ya WiFi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Weka intaneti ya Wi-Fi ya kusambazwa"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> intaneti ya Wi-Fi ya kusambazwa"</string>
@@ -956,7 +956,7 @@
     <string name="call_settings_title" msgid="5188713413939232801">"Mipangilio ya simu"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Weka mipangilio ya ujumbe wa sauti, kupitisha simu, kusubiri simu, kitambulisho cha mteja"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Shiriki intaneti kwa USB"</string>
-    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Mtandao-hewa unaobebwa"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Intaneti ya kusambazwa"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Shiriki intaneti kwa Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Inazuia"</string>
     <string name="tether_settings_title_all" msgid="8356136101061143841">"Kushiriki na kusambaza intaneti"</string>
@@ -1004,9 +1004,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Matumizi ya betri ya hali ya juu"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Haikutumia chaji nyingi"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Hali ya eneo"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Tumia GPS, Wi-Fi na mitandao ya simu kukadiria eneo"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Tumia Wi-Fi na mitandao ya simu kukadiria eneo"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Tumia GPS kutambua eneo lako"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Tumia GPS, Wi-Fi na mitandao ya simu kutambua eneo"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Tumia Wi-Fi na mitandao ya simu kutambua eneo"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Tumia GPS kutambua eneo lako"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Inarejesha…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Eneo la mtandao wa Wi-Fi na wa simu"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ruhusu programu zitumie huduma ya Google ya kutambua eneo ili kukadiria mahali ulipo kwa haraka. Data ya mahali isiyokutambulisha itakusanywa na kutumwa kwa Google."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 3f9d5c3..c5850bc 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"ใช้แบตเตอรี่มาก"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"ใช้แบตเตอรี่น้อย"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"โหมดตำแหน่ง"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"ใช้ GPS, WiFi, มือถือหาตำแหน่ง"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"ใช้ WiFi และมือถือหาตำแหน่ง"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"ใช้ GPS เพื่อระบุตำแหน่งของคุณ"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"ใช้ GPS, WiFi และเครือข่ายมือถือเพื่อหาตำแหน่ง"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"ใช้ WiFi และเครือข่ายมือถือเพื่อหาตำแหน่ง"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"ใช้ GPS เพื่อหาตำแหน่งของคุณ"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"กำลังเรียก…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"ตำแหน่ง WiFi และเครือข่าย"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ให้แอปต่างๆ ใช้บริการระบุตำแหน่งของ Google เพื่อระบุตำแหน่งโดยประมาณของคุณรวดเร็วยิ่งขึ้น โดยจะมีการรวบรวมและส่งข้อมูลตำแหน่งที่ไม่ระบุชื่อให้ Google"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index a5d7678..19e64e4 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Mataas na paggamit ng baterya"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Mababang paggamit ng baterya"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode ng lokasyon"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS, Wi‑Fi at mobile network, ipangtantiya ng lokasyon"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Wi‑Fi at mobile network, ipangtantiya ng lokasyon"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Ipangtukoy ng lokasyon mo ang GPS"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Gamitin ang GPS, Wi‑Fi, at mga mobile network upang matukoy ang lokasyon"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Gamitin ang Wi‑Fi at mga mobile network upang matukoy ang lokasyon"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Gamitin ang GPS upang matukoy ang iyong lokasyon"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Kinukuha…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Lokasyon ng Wi-Fi, mobile network"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ipagamit sa apps ang serbisyo ng lok. ng Google para mabilis na itantya ang iyong lok.  Kokolektahin at ipapadala sa Google ang mga di alam na data ng lok."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 326edff..9cad933 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Yüksek pil kullanımı"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Düşük pil kullanımı"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Konum modu"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Konumu yaklaşık olarak bulmak için GPS, Kablosuz ve mobil ağları kullanın"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Konumu yaklaşık olarak bulmak için Kablosuz ve mobil ağları kullanın"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Konumunuzu tam olarak bulmak için GPS\'yi kullanın"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Konumu belirlemek için GPS, Kablosuz ve mobil ağları kullanın"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Konumu belirlemek için Kablosuz ve mobil ağları kullanın"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Konumunuzu belirlemek için GPS kullanın"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Alınıyor…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Kablosuz ve mobil ağ konumu"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Uygulamalar konumunuzu daha hızlı tahmin edebilmek için Google\'ın konum bilgilerini kullanabilsin. Anonim konum bilgileri toplanıp Google\'a gönderilir."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index e1dcf3b..aea9899 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Значне використання заряду"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Низьке використання заряду"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим локації"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Використовувати GPS, Wi‑Fi і мобільні мережі для визначення місцезнаходження"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Використовувати Wi‑Fi і мобільні мережі для визначення місцезнаходження"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Використовувати GPS для визначення місцезнаходження"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Використовувати GPS, Wi‑Fi і мобільні мережі для визначення місцезнаходження"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Використовувати Wi‑Fi і мобільні мережі для визначення місцезнаходження"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Використовувати GPS для визначення місцезнаходження"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Отримання…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Місцезнах. Wi-Fi і моб. мережі"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Дозвольте програмам користуватися службою визначення місцезнаходження Google, щоб швидше оцінювати ваше місцезнаходження. Анонімна інформація про місцезнаходження збиратиметься та надсилатиметься в Google."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 40953d4..b9b64c4 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Mức sử dụng pin cao"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Mức sử dụng pin thấp"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Chế độ vị trí"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Dùng mạng GPS, WiFi, di động để đoán vị trí"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Dùng mạng WiFi &amp; di động để đoán v.trí"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Dùng GPS để xác định vị trí"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Sử dụng mạng GPS, Wi-Fi và di động để xác định vị trí"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Sử dụng mạng Wi-Fi và di động để xác định vị trí"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Sử dụng GPS để xác định vị trí của bạn"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Đang truy xuất…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Vị trí Wi‑Fi và mạng di động"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Cho phép ứng dụng dùng DV vị trí của Google để ước đoán vị trí nhanh hơn. Dữ liệu vị trí ẩn danh sẽ được thu thập và gửi tới Google."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index cc04e75..e980878f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"高电耗"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"低电耗"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"位置信息模式"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"使用 GPS、WLAN 和移动网络估测位置"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"使用 WLAN 和移动网络估测位置"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"使用 GPS 精确定位您的位置"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"使用 GPS、WLAN 和移动网络确定位置"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"使用 WLAN 和移动网络确定位置"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"使用 GPS 确定您的位置"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"正在检索…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"WLAN 和移动网络位置信息"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允许应用使用 Google 位置服务更快地大致了解您所在的位置。系统将收集匿名位置数据并将其发送给 Google。"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 280d673..79aba7d 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"高電池用量"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"低電池用量"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"定位模式"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"使用 GPS、Wi-Fi 和流動網絡確定約略的位置"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"使用 Wi-Fi 和流動網絡確定約略的位置"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"使用 GPS 定出您的精確位置"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"使用 GPS、Wi-Fi 和流動網絡確定位置"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"使用 Wi-Fi 和流動網絡確定位置"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"使用 GPS 確定您的位置"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"正在擷取…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi 和流動網絡位置資訊"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允許應用程式使用 Google 的位置資訊服務，藉此更快確定您的約略位置。系統會收集匿名的位置資料傳送給 Google。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 99960d4..7e25c65 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1010,9 +1010,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"耗電量高"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"耗電量低"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"定位模式"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"使用 GPS、Wi-Fi 和行動網路預估位置"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"使用 Wi-Fi 和行動網路預估位置"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"使用 GPS 定出您的精確位置"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"使用 GPS、Wi-Fi 和行動網路判斷位置"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"使用 Wi-Fi 和行動網路判斷位置"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"使用 GPS 判斷您的位置"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"擷取中…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi 和行動網路位置"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允許應用程式使用 Google 的定位服務加速判斷您的約略位置。系統會收集匿名的位置資料並傳送給 Google。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 46d5be7..86c4f5b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1011,9 +1011,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Ukusebenzisa ibhetri okuphezulu"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Ukusebenzisa ibhetri okuphansi"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Imodi yendawo"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Sebenzisa i-GPS, Wi‑Fi namanethiwekhi weselula ukulinganisa indawo"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Sebenzisa i-Wi‑Fi namanethiwekhi weselula ukuze ulinganise indawo"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Sebenzisa i-GPS ukuze ukhombe indawo yakho"</string>
+    <string name="location_mode_high_accuracy_description" msgid="6418936349431602808">"Sebenzisa i-GPS, Wi‑Fi, namanethiwekhi weselula ukuthola indawo"</string>
+    <string name="location_mode_battery_saving_description" msgid="1728668969743485109">"Sebenzisa i-Wi‑Fi namanethiwekhi weselula ukuze uthole indawo"</string>
+    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Sebenzisa i-GPS ukuze uthole indawo yakho"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Iyathola…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"I-Wi-Fi nendawo yenethiwekhi yeselula"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Vumela izinhlelo zokusebenza zisebenzise isevisi yendawo yakwa-Google ukucabangela indawo yakho ngokushesha. Idatha yendawo engaziwa izoqoqwa futhi ithunyelwe kwa-Google."</string>
diff --git a/res/values/bools.xml b/res/values/bools.xml
index 76dc44a..137d4ce 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -32,4 +32,7 @@
 
     <!-- Whether to show a preference item for regulatory information in About phone -->
     <bool name="config_show_regulatory_info">false</bool>
+
+    <!-- Whether to show a preference item for mobile plan -->
+    <bool name="config_show_mobile_plan">true</bool>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c97861d..9e283dd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1948,6 +1948,19 @@
     <!-- SIM card lock settings screen, SIM PIN dialog button labels: -->
     <string name="sim_enter_cancel">Cancel</string>
 
+    <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+    <string name="wrong_pin_code_pukked">Incorrect SIM PIN code you must now contact your carrier to unlock your device.</string>
+    <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+    <plurals name="wrong_pin_code">
+        <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="number">%d</xliff:g> remaining attempt before you must contact your carrier to unlock your device.</item>
+        <item quantity="other">Incorrect SIM PIN code, you have <xliff:g id="number">%d</xliff:g> remaining attempts.</item>
+    </plurals>
+    <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+    <string name="pin_failed">SIM PIN operation failed!</string>
+
     <!-- Advanced (used for diagnostics) device info activity title -->
     <string name="device_info_settings" product="tablet">Tablet status</string>
     <!-- Advanced (used for diagnostics) device info activity title -->
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index ab12587..b988572 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -29,6 +29,7 @@
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
+import android.util.Log;
 import android.widget.Toast;
 
 import com.android.internal.telephony.Phone;
@@ -46,6 +47,8 @@
  */
 public class IccLockSettings extends PreferenceActivity
         implements EditPinPreference.OnPinEnteredListener {
+    private static final String TAG = "IccLockSettings";
+    private static final boolean DBG = true;
 
     private static final int OFF_MODE = 0;
     // State when enabling/disabling ICC lock
@@ -101,10 +104,10 @@
             AsyncResult ar = (AsyncResult) msg.obj;
             switch (msg.what) {
                 case MSG_ENABLE_ICC_PIN_COMPLETE:
-                    iccLockChanged(ar.exception == null);
+                    iccLockChanged(ar.exception == null, msg.arg1);
                     break;
                 case MSG_CHANGE_ICC_PIN_COMPLETE:
-                    iccPinChanged(ar.exception == null);
+                    iccPinChanged(ar.exception == null, msg.arg1);
                     break;
                 case MSG_SIM_STATE_CHANGED:
                     updatePreferences();
@@ -352,21 +355,21 @@
         mPinToggle.setEnabled(false);
     }
 
-    private void iccLockChanged(boolean success) {
+    private void iccLockChanged(boolean success, int attemptsRemaining) {
         if (success) {
             mPinToggle.setChecked(mToState);
         } else {
-            Toast.makeText(this, mRes.getString(R.string.sim_lock_failed), Toast.LENGTH_SHORT)
+            Toast.makeText(this, getPinPasswordErrorMessage(attemptsRemaining), Toast.LENGTH_LONG)
                     .show();
         }
         mPinToggle.setEnabled(true);
         resetDialogState();
     }
 
-    private void iccPinChanged(boolean success) {
+    private void iccPinChanged(boolean success, int attemptsRemaining) {
         if (!success) {
-            Toast.makeText(this, mRes.getString(R.string.sim_change_failed),
-                    Toast.LENGTH_SHORT)
+            Toast.makeText(this, getPinPasswordErrorMessage(attemptsRemaining),
+                    Toast.LENGTH_LONG)
                     .show();
         } else {
             Toast.makeText(this, mRes.getString(R.string.sim_change_succeeded),
@@ -383,6 +386,23 @@
                 mNewPin, callback);
     }
 
+    private String getPinPasswordErrorMessage(int attemptsRemaining) {
+        String displayMessage;
+
+        if (attemptsRemaining == 0) {
+            displayMessage = mRes.getString(R.string.wrong_pin_code_pukked);
+        } else if (attemptsRemaining > 0) {
+            displayMessage = mRes
+                    .getQuantityString(R.plurals.wrong_pin_code, attemptsRemaining,
+                            attemptsRemaining);
+        } else {
+            displayMessage = mRes.getString(R.string.pin_failed);
+        }
+        if (DBG) Log.d(TAG, "getPinPasswordErrorMessage:"
+                + " attemptsRemaining=" + attemptsRemaining + " displayMessage=" + displayMessage);
+        return displayMessage;
+    }
+
     private boolean reasonablePin(String pin) {
         if (pin == null || pin.length() < MIN_PIN_LENGTH || pin.length() > MAX_PIN_LENGTH) {
             return false;
diff --git a/src/com/android/settings/KeyguardAppWidgetPickActivity.java b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
index f3db2ca..7e801be 100644
--- a/src/com/android/settings/KeyguardAppWidgetPickActivity.java
+++ b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
@@ -46,6 +46,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.GridView;
@@ -89,6 +90,8 @@
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        getWindow().addPrivateFlags(
+                WindowManager.LayoutParams.PRIVATE_FLAG_INHERIT_TRANSLUCENT_DECOR);
         setContentView(R.layout.keyguard_appwidget_picker_layout);
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 6724cc1..65127b5 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -333,6 +333,16 @@
             removePreference(KEY_MOBILE_NETWORK_SETTINGS);
             removePreference(KEY_MANAGE_MOBILE_PLAN);
         }
+        // Remove Mobile Network Settings and Manage Mobile Plan
+        // if config_show_mobile_plan sets false.
+        boolean isMobilePlanEnabled = this.getResources().getBoolean(
+                R.bool.config_show_mobile_plan);
+        if (!isMobilePlanEnabled) {
+            Preference pref = findPreference(KEY_MANAGE_MOBILE_PLAN);
+            if (pref != null) {
+                removePreference(KEY_MANAGE_MOBILE_PLAN);
+            }
+        }
         protectByRestrictions(KEY_MOBILE_NETWORK_SETTINGS);
         protectByRestrictions(KEY_MANAGE_MOBILE_PLAN);
 
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
index 77a9462..1263797 100755
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
@@ -149,7 +149,6 @@
             }
             if (profile instanceof MapProfile) {
                 profile.setPreferred(mDevice, true);
-                refresh();
             }
         } else if (profile instanceof MapProfile &&
                 newProfileState == BluetoothProfile.STATE_DISCONNECTED) {
@@ -158,7 +157,6 @@
                 mProfiles.remove(profile);
             }
             profile.setPreferred(mDevice, false);
-            refresh();
         } else if (mLocalNapRoleConnected && profile instanceof PanProfile &&
                 ((PanProfile) profile).isLocalRoleNap(mDevice) &&
                 newProfileState == BluetoothProfile.STATE_DISCONNECTED) {
@@ -489,7 +487,8 @@
         ParcelUuid[] localUuids = mLocalAdapter.getUuids();
         if (localUuids == null) return false;
 
-        mProfileManager.updateProfiles(uuids, localUuids, mProfiles, mRemovedProfiles, mLocalNapRoleConnected);
+        mProfileManager.updateProfiles(uuids, localUuids, mProfiles, mRemovedProfiles,
+                                       mLocalNapRoleConnected, mDevice);
 
         if (DEBUG) {
             Log.e(TAG, "updating profiles for " + mDevice.getAliasName());
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
index 78d6441..8fff9648 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
@@ -321,7 +321,7 @@
     synchronized void updateProfiles(ParcelUuid[] uuids, ParcelUuid[] localUuids,
             Collection<LocalBluetoothProfile> profiles,
             Collection<LocalBluetoothProfile> removedProfiles,
-            boolean isPanNapConnected) {
+            boolean isPanNapConnected, BluetoothDevice device) {
         // Copy previous profile list into removedProfiles
         removedProfiles.clear();
         removedProfiles.addAll(profiles);
@@ -367,6 +367,13 @@
             profiles.add(mPanProfile);
             removedProfiles.remove(mPanProfile);
         }
+
+        if ((mMapProfile != null) &&
+            (mMapProfile.getConnectionStatus(device) == BluetoothProfile.STATE_CONNECTED)) {
+            profiles.add(mMapProfile);
+            removedProfiles.remove(mMapProfile);
+            mMapProfile.setPreferred(device, true);
+        }
     }
 
 }