diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1a71b611151..ecf5c223af2 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -824,10 +824,10 @@
     <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>
-    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"‏أخفقت عملية WPS. يرجى إعادة المحاولة خلال بضع دقائق."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"‏تعذّر إتمام عملية WPS. يرجى إعادة المحاولة خلال بضع دقائق."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"‏إعداد أمان جهاز التوجيه اللاسلكي (WEP) ليس متوافقًا"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"‏إعداد أمان جهاز التوجيه اللاسلكي (TKIP) ليس متوافقًا"</string>
-    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"أخفقت المصادقة. يُرجى إعادة المحاولة."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"تعذّرت المصادقة. يُرجى إعادة المحاولة."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"‏تم اكتشاف جلسة WPS أخرى، يُرجى إعادة المحاولة خلال بضع دقائق."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"اسم الشبكة"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"‏أدخل SSID"</string>
@@ -1171,7 +1171,7 @@
       <item quantity="other">‏رمز رقم التعريف الشخصي لبطاقة SIM غير صحيح، ويتبقى لديك <xliff:g id="NUMBER_1">%d</xliff:g> من المحاولات.</item>
       <item quantity="one">‏رمزPIN لبطاقة SIM غير صحيح، ولديك محاولة واحدة (<xliff:g id="NUMBER_0">%d</xliff:g>) يجب أن تتصل بعدها بمشغّل شبكة الجوّال لإلغاء قفل الجهاز.</item>
     </plurals>
-    <string name="pin_failed" msgid="1848423634948587645">"‏أخفقت عملية \"رقم التعريف الشخصي\" لبطاقة SIM!"</string>
+    <string name="pin_failed" msgid="1848423634948587645">"‏تعذّر إتمام عملية \"رقم التعريف الشخصي\" لبطاقة SIM!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"حالة الجهاز اللوحي"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"حالة الهاتف"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"تحديثات النظام"</string>
@@ -2389,7 +2389,7 @@
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"تم تعطيل المزامنة"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"جارٍ المزامنة"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"خطأ في المزامنة"</string>
-    <string name="sync_failed" msgid="1696499856374109647">"أخفقت المزامنة"</string>
+    <string name="sync_failed" msgid="1696499856374109647">"تعذّرت المزامنة"</string>
     <string name="sync_active" msgid="8476943765960863040">"المزامنة نشطة"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"مزامنة"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"تواجه المزامنة حاليًا بعض المشاكل. وسوف تكون متاحة خلال وقت قصير."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 2c03a9da91d..a30bed15e66 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -223,7 +223,7 @@
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
     <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"अपडेट करें"</string>
     <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"रीफ़्रेश करें"</string>
-    <string name="radio_info_toggle_dns_check_label" msgid="6625185764803245075">"DNS जांच टॉगल करें"</string>
+    <string name="radio_info_toggle_dns_check_label" msgid="6625185764803245075">"DNS जाँच टॉगल करें"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-खास जानकारी/सेटिंग"</string>
     <string name="band_mode_title" msgid="4071411679019296568">"रेडियो बैंड मोड सेट करें"</string>
     <string name="band_mode_loading" msgid="3555063585133586152">"बैंड सूची लोड कर रहा है..."</string>
@@ -1002,7 +1002,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"कोई परिणाम नहीं"</string>
     <string name="search_clear_history" msgid="4196658962573162457">"इतिहास साफ़ करें"</string>
     <string name="display_settings" msgid="7965901687241669598">"स्क्रीन सेटिंग"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"स्‍क्रीन अपनेआप घुमाएं"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"स्‍क्रीन अपने आप घुमाएं"</string>
     <string name="color_mode_title" msgid="9186249332902370471">"रंग"</string>
     <string name="color_mode_option_natural" msgid="5013837483986772758">"बिना किसी बदलाव के"</string>
     <string name="color_mode_option_boosted" msgid="8588223970257287524">"बढ़ाया गया"</string>
@@ -1741,7 +1741,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\".\" सम्‍मिलित करने के लिए Space कुंजी दो बार दबाएं"</string>
     <string name="show_password" msgid="4837897357002495384">"पासवर्ड दिखाएं"</string>
     <string name="show_password_summary" msgid="3365397574784829969">"लिखते समय वर्ण दिखाएं"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"यह स्पेलिंग जांचने वाला निजी डेटा, जैसे पासवर्ड और क्रेडिट कार्ड नंबर के साथ आपके लिखे सभी लेख इकट्ठा कर सकता है. यह एप्‍लिकेशन <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> से आता है. इस स्पेलिंग जांचने वाले का इस्तेमाल करें?"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"यह स्पेलिंग जाँचने वाला निजी डेटा, जैसे पासवर्ड और क्रेडिट कार्ड नंबर के साथ आपके लिखे सभी लेख इकट्ठा कर सकता है. यह एप्‍लिकेशन <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> से आता है. इस स्पेलिंग जाँचने वाले का इस्तेमाल करें?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"सेटिंग"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"भाषा"</string>
     <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"कीबोर्ड और इनपुट"</string>
@@ -2358,7 +2358,7 @@
     <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"गलत पैटर्न"</string>
     <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"गलत पासवर्ड"</string>
     <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"गलत पिन"</string>
-    <string name="checking_decryption" msgid="8287458611802609493">"जांच की जा रही है..."</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"जाँच की जा रही है..."</string>
     <string name="starting_android" msgid="4001324195902252681">"Android प्रारंभ किया जा रहा है..."</string>
     <string name="delete" msgid="4219243412325163003">"मिटाएं"</string>
     <string name="misc_files" msgid="6720680815969643497">"विविध फ़ाइलें"</string>
@@ -2538,7 +2538,7 @@
     <string name="user_credential_title" msgid="1954061209643070652">"क्रेडेंशियल की पूरी जानकारी"</string>
     <string name="user_credential_removed" msgid="6514189495799401838">"क्रेडेंशियल निकाला गया: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"कोई यूज़र क्रेडेंशियल इंस्टॉल नहीं है"</string>
-    <string name="spellcheckers_settings_title" msgid="399981228588011501">"शब्द जांच"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"शब्द जाँच"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"अपना वर्तमान पूर्ण बैकअप पासवर्ड यहां लिखें"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"पूर्ण बैकअप के लिए यहां नया पासवर्ड लिखें"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"यहां अपना नया पूर्ण बैकअप पासवर्ड फिर से लिखें"</string>
@@ -2564,8 +2564,8 @@
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"एक तृतीय पक्ष ईमेल, ऐप्स और सुरक्षित वेबसाइटों सहित आपकी नेटवर्क गतिविधि को मॉनीटर करने में सक्षम है.\n\nआपके डिवाइस पर इंस्टॉल किए गए एक विश्वसनीय क्रेंडेशियल के कारण ऐसा संभव हो रहा है."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
-      <item quantity="one">प्रमाणपत्रों की जांच करें</item>
-      <item quantity="other">प्रमाणपत्रों की जांच करें</item>
+      <item quantity="one">प्रमाणपत्रों की जाँच करें</item>
+      <item quantity="other">प्रमाणपत्रों की जाँच करें</item>
     </plurals>
     <string name="user_settings_title" msgid="6151874007858148344">"उपयोगकर्ता"</string>
     <string name="user_list_title" msgid="7937158411137563543">"उपयोगकर्ता और प्रोफ़ाइल"</string>
@@ -3456,8 +3456,8 @@
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"%1$s बैटरी शेष रहने पर अपने आप चालू करें"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"बैटरी ऑप्टिमाइज़ेशन का उपयोग नहीं कर रहा है"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"अगर डिवाइस लॉक है, तो सूचनाओं का जवाब या अन्य लेख लिखने से रोकें"</string>
-    <string name="default_spell_checker" msgid="8506899870026026660">"डिफ़ॉल्ट वर्तनी-जांचकर्ता"</string>
-    <string name="choose_spell_checker" msgid="6596539862291699367">"वर्तनी-जांचकर्ता चुनें"</string>
+    <string name="default_spell_checker" msgid="8506899870026026660">"डिफ़ॉल्ट वर्तनी-जाँचकर्ता"</string>
+    <string name="choose_spell_checker" msgid="6596539862291699367">"वर्तनी-जाँचकर्ता चुनें"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"नहीं चुना गया"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(कुछ नहीं)"</string>
     <string name="notification_log_details_delimiter" msgid="3116559361552416747">": "</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 048fe7c5224..777b817f02b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -3579,12 +3579,12 @@
     <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"휴대전화를 두 번 돌려 셀카 모드를 실행합니다."</string>
     <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"태블릿을 두 번 돌려 셀카 모드를 실행합니다."</string>
     <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"기기를 두 번 돌려 셀카 모드를 실행합니다."</string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"두 번 탭하여 스마트폰 확인"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"두 번 탭하여 휴대전화 확인"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"두 번 탭하여 태블릿 확인"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"두 번 탭하여 기기 확인"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"시간, 알림 아이콘, 기타 정보를 확인하려면 화면을 두 번 탭하세요."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"화면이 꺼져 있을 때도 알림을 확인할 수 있습니다."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"들어서 스마트폰 확인"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"들어올려 휴대전화 확인"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"들어서 태블릿 확인"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"들어서 기기 확인"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"시간, 알림 아이콘 등의 정보를 확인하려면 휴대전화를 들어 올리세요."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7206c239621..20fe95b33c7 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -129,7 +129,7 @@
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Hakuna vifaa vya Bluetooth vilivyopatikana karibu."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Ombi la kuoanisha Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Ombi la ulinganishaji"</string>
-    <string name="bluetooth_notif_message" msgid="5057417127600942904">"Gonga ili uoanishe na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_notif_message" msgid="5057417127600942904">"Gusa ili uoanishe na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Faili zilizopokelewa"</string>
     <string name="device_picker" msgid="4978696506172252813">"Chagua kifaa cha Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha Bluetooth"</string>
@@ -156,7 +156,7 @@
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Inazima Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Unganisha-kiotomatiki"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Muunganisho wa Bluetooth umeombwa"</string>
-    <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Gonga ili uunganishe kwenye \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Gusa ili uunganishe kwenye \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Unataka kuunganishwa kwa\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Ombi la kufikia anwani kwenye simu"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> inataka kufikia anwani zako na rekodi ya simu zilizopigwa. Ungependa kuipa <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> idhini ya kufikia?"</string>
@@ -708,7 +708,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Imezimwa"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Haipatikani kwa sababu NFC imezimwa"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Unapowasha kipengele hiki, unaweza kutuma maudhui ya programu kwenye kifaa kingine kinachoweza kutumia NFC kwa kuviweka vifaa pamoja. Kwa mfano, unaweza kutuma kurasa za wavuti, video za YouTube, anwani na mengineyo.\n\nWeka tu vifaa pamoja (kwa kuvigusisha sehemu za nyuma) na ugonge skrini yako. Programu itabaini kile kitatumwa."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Unapowasha kipengele hiki, unaweza kutuma maudhui ya programu kwenye kifaa kingine kinachoweza kutumia NFC kwa kuviweka vifaa pamoja. Kwa mfano, unaweza kutuma kurasa za wavuti, video za YouTube, anwani na mengineyo.\n\nWeka tu vifaa pamoja (kwa kuvigusisha sehemu za nyuma) na uguse skrini yako. Programu itabaini kile kitatumwa."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Washa Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -771,8 +771,8 @@
     <string name="wifi_more" msgid="3195296805089107950">"Zaidi"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Usanidi kiotomatiki (WPS)"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Chaguo za kina"</string>
-    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"Orodha ya menyu kunjuzi ya Chaguo za Kina. Gonga mara mbili ili ukunje."</string>
-    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"Orodha ya menyu kunjuzi ya Chaguo za Kina. Gonga mara mbili ili upanue."</string>
+    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"Orodha ya menyu kunjuzi ya Chaguo za Kina. Gusa mara mbili ili ukunje."</string>
+    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"Orodha ya menyu kunjuzi ya Chaguo za Kina. Gusa mara mbili ili upanue."</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Usanidi Uliolindwa na Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Inaanzisha WPS ..."</string>
     <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"Bonyeza kitufe cha Wi‑Fi Protected Setup kwenye ruta yako. Inaweza kuitwa \'\'WPS\'\' au kuwekwa alama hii:"</string>
@@ -1259,7 +1259,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Nyingine"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Mfumo"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Gundua <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Faili nyingine zilizopo ni kama vile faili zilizohifadhiwa na programu, faili zilizopakuliwa kutoka kwenye Intaneti au Bluetooth, faili za Android, na kadhalika.\n\nIli kuona maudhui ya <xliff:g id="NAME">^1</xliff:g> yanayoweza kuonekana, gonga Gundua."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Faili nyingine zilizopo ni kama vile faili zilizohifadhiwa na programu, faili zilizopakuliwa kutoka kwenye Intaneti au Bluetooth, faili za Android, na kadhalika.\n\nIli kuona maudhui ya <xliff:g id="NAME">^1</xliff:g> yanayoweza kuonekana, gusa Gundua."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"Mfumo unajumuisha faili zinazotumika katika toleo la Android la <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"Huenda <xliff:g id="USER_0">^1</xliff:g> amehifadhi picha, muziki, programu au data, kwa kutumia <xliff:g id="SIZE">^2</xliff:g> ya hifadhi. \n\nIli kuona maelezo, tumia <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Sanidi <xliff:g id="NAME">^1</xliff:g> yako"</string>
@@ -1715,7 +1715,7 @@
     <string name="service_stop_description" msgid="9146619928198961643">"Huduma hii ilianzishwa na programu yake. Kuisitisha kunaweza kuifanya programu iache kufanya kazi."</string>
     <string name="heavy_weight_stop_description" msgid="6050413065144035971">"Programu hii haiwezi kusitishwa kwa usalama. Ukiisitisha, unaweza kupoteza baadhi ya kazi yako ya sasa."</string>
     <string name="background_process_stop_description" msgid="3834163804031287685">"Hii ni utaratibu wa zamani ya programu ambayo bado inaendeshwa iwapo itahitajika tena. Huwa hakuna sababu ya kuisitisha."</string>
-    <string name="service_manage_description" msgid="479683614471552426">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: inatumika kwa sasa. Gonga Mipangilio ili uidhibiti."</string>
+    <string name="service_manage_description" msgid="479683614471552426">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: inatumika kwa sasa. Gusa Mipangilio ili uidhibiti."</string>
     <string name="main_running_process_description" msgid="1130702347066340890">"Utaratibu kuu ambao unatumika."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Huduma inatumika <xliff:g id="COMP_NAME">%1$s</xliff:g>"</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Mtoaji huduma <xliff:g id="COMP_NAME">%1$s</xliff:g> anatumika"</string>
@@ -1780,7 +1780,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Hariri Neno"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Hariri"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Futa"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"Huna maneno yoyote katika kamusi ya mtumiaji. Gonga kitufe cha Ongeza (+) ili uongeze neno."</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"Huna maneno yoyote katika kamusi ya mtumiaji. Gusa kitufe cha Ongeza (+) ili uongeze neno."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Ya lugha zote"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Lugha zaidi..."</string>
     <string name="testing" msgid="6584352735303604146">"Majaribio"</string>
@@ -1833,10 +1833,10 @@
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Kuza ukitumia kitufe"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Kuza ukitumia kitufe na kugonga mara tatu"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Vuta karibu kwenye skrini"</string>
-    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Gonga mara 3 ili ukuze"</string>
-    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Gonga kitufe ili ukuze"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Ili kukuza"</b>", gonga skrini mara 3 haraka.\n"<ul><li>"Buruta vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gonga skrini mara 3 kwa haraka na ukifika mara ya tatu, usiondoe kidole.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili uvute mbali"</li></ul>\n\n"Huwezi kukuza ukitumia kibodi au sehemu ya viungo muhimu."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Ukiwasha kipengele cha ukuzaji, tumia Kitufe cha zana za walio na matatizo ya kuona au kusikia hapo chini ya skrini ili ukuze haraka.\n\n"<b>"Ili kukuza"</b>", gusa Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha ugonge mahali popote kwenye skrini.\n"<ul><li>"Buruta kwa kutumia vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gusa Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uguse na ushikilie mahali popote kwenye skrini.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili usogeze mbali"</li></ul>\n\n"Huwezi kuvuta karibu kwenye kibodi au sehemu ya viungo muhimu."</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Gusa mara 3 ili ukuze"</string>
+    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Gusa kitufe ili ukuze"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Ili kukuza"</b>", gusa skrini mara 3 haraka.\n"<ul><li>"Buruta vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gusa skrini mara 3 kwa haraka na ukifika mara ya tatu, usiondoe kidole.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili uvute mbali"</li></ul>\n\n"Huwezi kukuza ukitumia kibodi au sehemu ya viungo muhimu."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Ukiwasha kipengele cha ukuzaji, tumia Kitufe cha zana za walio na matatizo ya kuona au kusikia hapo chini ya skrini ili ukuze haraka.\n\n"<b>"Ili kukuza"</b>", gusa Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uguse mahali popote kwenye skrini.\n"<ul><li>"Buruta kwa kutumia vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gusa Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uguse na ushikilie mahali popote kwenye skrini.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili usogeze mbali"</li></ul>\n\n"Huwezi kuvuta karibu kwenye kibodi au sehemu ya viungo muhimu."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Kitufe cha zana za walio na matatizo ya kuona au kusikia kimewekwa kuwa <xliff:g id="SERVICE">%1$s</xliff:g>. Gusa na ushikilie Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uchague ukuzaji ili utumie kipengele cha ukuzaji."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Njia ya mkato ya kitufe cha sauti"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Huduma ya njia ya mkato"</string>
@@ -2290,7 +2290,7 @@
     <string name="wifi_setup_save" msgid="3659235094218508211">"Hifadhi"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"Ghairi"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Inatambaza mitandao..."</string>
-    <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"Gonga mtandao ili uunganishe"</string>
+    <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"Gusa mtandao ili uunganishe"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Unganisha kwa mtandao uliopo"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Unganisha kwenye mtandao usio salama"</string>
     <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"Andika usanidi wa mtandao"</string>
@@ -2300,7 +2300,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAP haiauniwi."</string>
     <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"Huwezi kusanidi muunganisho wa EAP Wi-Fi wakati wa usanidi. Baada ya kusanidi, unaweza kufanya hivyo katika Mipangilio &gt; mitandao isiyotumia waya."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Kuunganisha kunaweza kuchukua dakika chache..."</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"Gonga "<b>"Inayofuata"</b>" ili uendelee kuweka mipangilio.\n\nGonga "<b>"Nyuma"</b>" ili uunganishe kwenye mtandao tofauti wa Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"Gusa "<b>"Inayofuata"</b>" ili uendelee kuweka mipangilio.\n\nGusa "<b>"Nyuma"</b>" ili uunganishe kwenye mtandao tofauti wa Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Kusawazisha kumelemazwa"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Kusawazisha kumelemazwa"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Inasawazisha sasa"</string>
@@ -2328,7 +2328,7 @@
     <string name="settings_backup_summary" msgid="7916877705938054035">"Hifadhi nakala za mipangilio yangu"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sawazisha sasa"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Ghairi usawazishaji"</string>
-    <string name="sync_one_time_sync" msgid="3733796114909082260">"Gonga ili usawazishe<xliff:g id="LAST_SYNC_TIME">
+    <string name="sync_one_time_sync" msgid="3733796114909082260">"Gusa ili usawazishe<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g> sasa"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalenda"</string>
@@ -2706,9 +2706,9 @@
     <string name="sim_settings_title" msgid="6822745211458959756">"SIM kadi"</string>
     <string name="sim_settings_summary" msgid="4050372057097516088">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
     <string name="sim_cards_changed_message" msgid="7900721153345139783">"SIM kadi zimebadilika"</string>
-    <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"Gonga ili uweke mipangilio ya shughuli"</string>
+    <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"Gusa ili uweke mipangilio ya shughuli"</string>
     <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"Data ya mtandao wa simu haipatikani"</string>
-    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Gonga ili uchague SIM ya data"</string>
+    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Gusa ili uchague SIM ya data"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Tumia hii kwa simu wakati wote"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Chagua SIM ya data"</string>
     <string name="data_switch_started" msgid="2040761479817166311">"Inabadili SIM ya data, hii inaweza kuchukua hadi dakika moja..."</string>
@@ -2736,7 +2736,7 @@
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Zima Utangazaji wa Jina la Mtandao itazuia uunganishaji otomatiki kwenye mitandao iliyofichika."</string>
     <string name="sim_signal_strength" msgid="9144010043784767984">"dBm <xliff:g id="DBM">%1$d</xliff:g> asu <xliff:g id="ASU">%2$d</xliff:g>"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM kadi zimebadilishwa."</string>
-    <string name="sim_notification_summary" msgid="8858043655706669772">"Gonga ili uweke mipangilio"</string>
+    <string name="sim_notification_summary" msgid="8858043655706669772">"Gusa ili uweke mipangilio"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM inayopendelewa kwa"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Uliza kila wakati"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Uteuzi unahitajika"</string>
@@ -2802,12 +2802,12 @@
     <string name="keywords_profile_challenge" msgid="789611397846512845">"mashindano kazini, kazi, wasifu"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"wasifu wa kazini, wasifu uliodhibitiwa, unganisha, uunganishaji, kazi, wasifu"</string>
     <string name="keywords_gesture" msgid="3526905012224714078">"ishara"</string>
-    <string name="keywords_payment_settings" msgid="5220104934130446416">"lipa, gonga, malipo"</string>
+    <string name="keywords_payment_settings" msgid="5220104934130446416">"lipa, gusa, malipo"</string>
     <string name="keywords_backup" msgid="470070289135403022">"hifadhi rudufu, hifadhi nakala"</string>
     <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ishara"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Sanidi tagi ya NFC ya Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Andika"</string>
-    <string name="status_awaiting_tap" msgid="2130145523773160617">"Gonga tagi ya NFC ili uandike..."</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Gusa tagi ya NFC ili uandike..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Nenosiri si sahihi, jaribu tena."</string>
     <string name="status_write_success" msgid="5228419086308251169">"Imefanikiwa!"</string>
     <string name="status_failed_to_write" msgid="8072752734686294718">"Haiwezi kuandika data kwenye tagi ya NFC. Kama tatizo litaendelea, jaribu tagi tofauti"</string>
@@ -3058,7 +3058,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Imewashwa"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Imezimwa"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Kudumisha programu moja"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Wakati mipangilio hii imewashwa, unaweza kutumia kipengele cha kudumisha programu moja ili uweze kutumia skrini ya sasa hadi utakapokiondoa.\n\nIli kudumisha programu moja:\n\n1. Hakikisha kuwa umewasha kipengele cha kudumisha programu moja.\n\n2. Fungua skrini unayotaka kutumia.\n\n3. Gonga Muhtasari.\n\n4. Telezesha kidole juu kisha ugonge aikoni ya kubandika."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Wakati mipangilio hii imewashwa, unaweza kutumia kipengele cha kudumisha programu moja ili uweze kutumia skrini ya sasa hadi utakapokiondoa.\n\nIli kudumisha programu moja:\n\n1. Hakikisha kuwa umewasha kipengele cha kudumisha programu moja.\n\n2. Fungua skrini unayotaka kutumia.\n\n3. Gusa Muhtasari.\n\n4. Telezesha kidole juu kisha uguse aikoni ya kubandika."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Omba mchoro wa kufungua kabla hujabandua"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Itisha PIN kabla hujabandua"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Omba nenosiri kabla hujabandua"</string>
@@ -3141,8 +3141,8 @@
     <string name="unknown_app" msgid="5275921288718717656">"Programu isiyojulikana"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Ruhusa za programu"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"Programu zinazotumia <xliff:g id="APPS">%1$s</xliff:g>"</string>
-    <string name="tap_to_wake" msgid="7211944147196888807">"Gonga ili uanze kutumia"</string>
-    <string name="tap_to_wake_summary" msgid="4341387904987585616">"Gonga mara mbili mahali popote kwenye skrini ili uanze kutumia kifaa"</string>
+    <string name="tap_to_wake" msgid="7211944147196888807">"Gusa ili uanze kutumia"</string>
+    <string name="tap_to_wake_summary" msgid="4341387904987585616">"Gusa mara mbili mahali popote kwenye skrini ili uanze kutumia kifaa"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Viungo vya kufungua"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Usifungue viungo vinavyoweza kutumika"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Fungua <xliff:g id="DOMAIN">%s</xliff:g>"</string>
@@ -3579,9 +3579,9 @@
     <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Geuza simu mara mbili ili uweke picha ya kujipiga mwenyewe"</string>
     <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Geuza kompyuta kibao mara mbili ili uweke picha ya kujipiga mwenyewe"</string>
     <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Geuza kifaa mara mbili ili uweke picha ya kujipiga mwenyewe"</string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Gonga mara mbili ili uangalie simu"</string>
-    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Gonga mara mbili ili uangalie kompyuta kibao"</string>
-    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Gonga mara mbili ili uangalie kifaa"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Gusa mara mbili ili uangalie simu"</string>
+    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Gusa mara mbili ili uangalie kompyuta kibao"</string>
+    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Gusa mara mbili ili uangalie kifaa"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"Ili uangalie saa, aikoni za arifa na maelezo mengine, gusa skrini yako mara mbili."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Angalia arifa wakati skrini imezimwa"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Inua ili uangalie simu"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 83325e9fad3..0b3ffdb47bb 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1396,7 +1396,7 @@
     <string name="tethering_footer_info" msgid="1308462275952345985">"ใช้ฮอตสปอตและการเชื่อมต่อผ่านมือถือเพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตผ่านการเชื่อมต่ออินเทอร์เน็ตมือถือได้ แอปสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้ได้ด้วย"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ความช่วยเหลือ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"เครือข่ายมือถือ"</string>
-    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"แพคเกจอินเทอร์เน็ต"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"แพ็กเกจอินเทอร์เน็ต"</string>
     <string name="sms_application_title" msgid="4903928270533250448">"แอป SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"เปลี่ยนแอป SMS ไหม"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"ใช้ <xliff:g id="NEW_APP">%1$s</xliff:g> เป็นแอป SMS ของคุณแทน <xliff:g id="CURRENT_APP">%2$s</xliff:g> ไหม"</string>