Merge tag 'android-6.0.0_r26' into cm-13.0

Android 6.0.0 release 26

15 files changed, 54 insertions, 44 deletions

diff --git a/java/res/values-bn-rBD/strings.xml b/java/res/values-bn-rBD/strings.xml
index 31ce7ba9c..a8026a80a 100644
--- a/java/res/values-bn-rBD/strings.xml
+++ b/java/res/values-bn-rBD/strings.xml
@@ -101,7 +101,7 @@
     <string name="account_select_ok" msgid="9141195141763227797">"ঠিক আছে"</string>
     <string name="account_select_cancel" msgid="5181012062618504340">"বাতিল করুন"</string>
     <string name="account_select_sign_out" msgid="3299651159390187933">"সাইন আউট"</string>
-    <string name="account_select_title" msgid="6279711684772922649">"ব্যবহার করার জন্য একটি অ্যাকাউন্ট নির্বাচন করুন"</string>
+    <string name="account_select_title" msgid="6279711684772922649">"ব্যবহার করার জন্য একটি অ্যাকাউন্ট বাছুন"</string>
     <string name="subtype_en_GB" msgid="88170601942311355">"ইংরেজি (UK)"</string>
     <string name="subtype_en_US" msgid="6160452336634534239">"ইংরেজি (US)"</string>
     <string name="subtype_es_US" msgid="5583145191430180200">"স্প্যানিশ (US)"</string>
diff --git a/java/res/values-ca/strings-talkback-descriptions.xml b/java/res/values-ca/strings-talkback-descriptions.xml
index 625afb7a7..37e7233b3 100644
--- a/java/res/values-ca/strings-talkback-descriptions.xml
+++ b/java/res/values-ca/strings-talkback-descriptions.xml
@@ -59,7 +59,7 @@
     <string name="keyboard_mode_date" msgid="6597407244976713364">"data"</string>
     <string name="keyboard_mode_date_time" msgid="3642804408726668808">"data i hora"</string>
     <string name="keyboard_mode_email" msgid="1239682082047693644">"adreça electrònica"</string>
-    <string name="keyboard_mode_im" msgid="3812086215529493501">"missatgeria"</string>
+    <string name="keyboard_mode_im" msgid="3812086215529493501">"missatges"</string>
     <string name="keyboard_mode_number" msgid="5395042245837996809">"número"</string>
     <string name="keyboard_mode_phone" msgid="2486230278064523665">"telèfon"</string>
     <string name="keyboard_mode_text" msgid="9138789594969187494">"text"</string>
diff --git a/java/res/values-cs/strings-emoji-descriptions.xml b/java/res/values-cs/strings-emoji-descriptions.xml
index b7f359c55..003e2cab4 100644
--- a/java/res/values-cs/strings-emoji-descriptions.xml
+++ b/java/res/values-cs/strings-emoji-descriptions.xml
@@ -138,7 +138,7 @@
     <string name="spoken_emoji_2B1C" msgid="5793146430145248915">"Bílý velký čtverec"</string>
     <string name="spoken_emoji_2B50" msgid="3850845519526950524">"Bílá střední hvězda"</string>
     <string name="spoken_emoji_2B55" msgid="9137882158811541824">"Tučný velký kruh"</string>
-    <string name="spoken_emoji_3030" msgid="4609172241893565639">"Vlnitá pomlčka"</string>
+    <string name="spoken_emoji_3030" msgid="4609172241893565639">"Vlnovka wavy dash"</string>
     <string name="spoken_emoji_303D" msgid="2545833934975907505">"Znak výměny části"</string>
     <string name="spoken_emoji_3297" msgid="928912923628973800">"Znak Blahopřání v kroužku"</string>
     <string name="spoken_emoji_3299" msgid="3930347573693668426">"Znak Tajný v kroužku"</string>
diff --git a/java/res/values-fa/strings-talkback-descriptions.xml b/java/res/values-fa/strings-talkback-descriptions.xml
index ba9c33952..e7c1432f3 100644
--- a/java/res/values-fa/strings-talkback-descriptions.xml
+++ b/java/res/values-fa/strings-talkback-descriptions.xml
@@ -64,7 +64,7 @@
     <string name="keyboard_mode_phone" msgid="2486230278064523665">"تلفن"</string>
     <string name="keyboard_mode_text" msgid="9138789594969187494">"نوشتار"</string>
     <string name="keyboard_mode_time" msgid="8558297845514402675">"زمان"</string>
-    <string name="keyboard_mode_url" msgid="8072011652949962550">"نشانی اینترنتی"</string>
+    <string name="keyboard_mode_url" msgid="8072011652949962550">"نشانی وب"</string>
     <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"موارد اخیر"</string>
     <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"افراد"</string>
     <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"اشیاء"</string>
diff --git a/java/res/values-fa/strings.xml b/java/res/values-fa/strings.xml
index 2c1956f05..86fc672d7 100644
--- a/java/res/values-fa/strings.xml
+++ b/java/res/values-fa/strings.xml
@@ -132,7 +132,7 @@
     <string name="keyboard_layout_set" msgid="4309233698194565609">"چیدمان"</string>
     <string name="custom_input_style_note_message" msgid="8826731320846363423">"سبک ورودی سفارشی شما باید قبل از شروع به استفاده از آن فعال شود. می‌خواهید اکنون آن را فعال کنید؟"</string>
     <string name="enable" msgid="5031294444630523247">"فعال کردن"</string>
-    <string name="not_now" msgid="6172462888202790482">"الآن نه"</string>
+    <string name="not_now" msgid="6172462888202790482">"اکنون نه"</string>
     <string name="custom_input_style_already_exists" msgid="8008728952215449707">"سبک ورودی مشابهی در حال حاضر وجود دارد: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
     <string name="prefs_keypress_vibration_duration_settings" msgid="7918341459947439226">"طول مدت لرزش در اثر فشردن کلید"</string>
     <string name="prefs_keypress_sound_volume_settings" msgid="6027007337036891623">"میزان صدای فشردن کلید"</string>
@@ -183,7 +183,7 @@
     <string name="install_dict" msgid="180852772562189365">"نصب"</string>
     <string name="cancel_download_dict" msgid="7843340278507019303">"لغو"</string>
     <string name="delete_dict" msgid="756853268088330054">"حذف"</string>
-    <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"‏برای زبان انتخاب شده در دستگاه همراه شما فرهنگ لغتی در دسترس است.&lt;br/&gt; توصیه می‌کنیم برای بهبود بخشیدن به تجربه تایپ کردنتان، فرهنگ لغت <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> را &lt;b&gt;دانلود کنید&lt;/b&gt;.‏&lt;br/&gt; &lt;br/&gt; دانلود از طریق 3G ممکن است یک یا دو دقیقه طول بکشد. اگر &lt;b&gt;طرح داده نامحدود&lt;/b&gt; نداشته باشید، ممکن است هزینه‌هایی برای شما اعمال شوند.&lt;br/&gt; اگر مطمئن نیستید چه طرح داده‌ای دارید٬ توصیه می‌کنیم یک اتصال Wi-Fi بیابید تا دانلود به طور خودکار شروع شود.&lt;br/&gt; &lt;br/&gt; نکته: با رفتن به بخش &lt;b&gt;زبان و ورودی&lt;/b&gt; در منوی &lt;b&gt;تنظیمات&lt;/b&gt; دستگاهتان، فرهنگ‌های لغت را دانلود یا حذف کنید."</string>
+    <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"‏برای زبان انتخاب شده در دستگاه همراه شما فرهنگ لغتی در دسترس است.&lt;br/&gt; توصیه می‌کنیم برای بهبود بخشیدن به تجربه تایپ کردنتان، فرهنگ لغت <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> را &lt;b&gt;دانلود کنید&lt;/b&gt;.‏&lt;br/&gt; &lt;br/&gt; دانلود از طریق 3G ممکن است یک یا دو دقیقه طول بکشد. اگر &lt;b&gt;طرح داده نامحدود&lt;/b&gt; نداشته باشید، ممکن است هزینه‌هایی برای شما اعمال شوند.&lt;br/&gt; اگر مطمئن نیستید چه طرح داده‌ای دارید٬ توصیه می‌کنیم یک اتصال Wi-Fi پیدا کنید تا دانلود به‌طور خودکار شروع شود.&lt;br/&gt; &lt;br/&gt; نکته: با رفتن به بخش &lt;b&gt;زبان و ورودی&lt;/b&gt; در منوی &lt;b&gt;تنظیمات&lt;/b&gt; دستگاهتان، فرهنگ‌های لغت را دانلود یا حذف کنید."</string>
     <string name="download_over_metered" msgid="1643065851159409546">"هم‌اکنون بارگیری شود (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> مگابایت)"</string>
     <string name="do_not_download_over_metered" msgid="2176209579313941583">"‏دانلود ازطریق Wi-Fi"</string>
     <string name="dict_available_notification_title" msgid="4583842811218581658">"یک فرهنگ لغت برای <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> در دسترس است"</string>
diff --git a/java/res/values-fr/strings-emoji-descriptions.xml b/java/res/values-fr/strings-emoji-descriptions.xml
index 1f99ee3bc..8e880f26e 100644
--- a/java/res/values-fr/strings-emoji-descriptions.xml
+++ b/java/res/values-fr/strings-emoji-descriptions.xml
@@ -781,7 +781,7 @@
     <string name="spoken_emoji_1F680" msgid="513263736012689059">"Fusée"</string>
     <string name="spoken_emoji_1F681" msgid="9201341783850525339">"Hélicoptère"</string>
     <string name="spoken_emoji_1F682" msgid="8046933583867498698">"Locomotive à vapeur"</string>
-    <string name="spoken_emoji_1F683" msgid="8772750354339223092">"Wagon"</string>
+    <string name="spoken_emoji_1F683" msgid="8772750354339223092">"Voiture"</string>
     <string name="spoken_emoji_1F684" msgid="346396777356203608">"Train à grande vitesse"</string>
     <string name="spoken_emoji_1F685" msgid="1237059817190832730">"Train à grande vitesse avec nez arrondi"</string>
     <string name="spoken_emoji_1F686" msgid="3525197227223620343">"Train"</string>
diff --git a/java/res/values-gu-rIN/strings-emoji-descriptions.xml b/java/res/values-gu-rIN/strings-emoji-descriptions.xml
index 89e347c6f..730f4f358 100644
--- a/java/res/values-gu-rIN/strings-emoji-descriptions.xml
+++ b/java/res/values-gu-rIN/strings-emoji-descriptions.xml
@@ -556,7 +556,7 @@
     <string name="spoken_emoji_1F4C2" msgid="8095638715523765338">"ખુલ્લુ ફાઇલ ફોલ્ડર"</string>
     <string name="spoken_emoji_1F4C3" msgid="3727274466173970142">"કર્લ સાથે પૃષ્ઠ"</string>
     <string name="spoken_emoji_1F4C4" msgid="4382570710795501612">"ઉપર ફેસિંગવાળું પૃષ્ઠ"</string>
-    <string name="spoken_emoji_1F4C5" msgid="8693944622627762487">"કૅલેન્ડર"</string>
+    <string name="spoken_emoji_1F4C5" msgid="8693944622627762487">"કેલેન્ડર"</string>
     <string name="spoken_emoji_1F4C6" msgid="8469908708708424640">"ટીઅર-ઑફ કેલેન્ડર"</string>
     <string name="spoken_emoji_1F4C7" msgid="2665313547987324495">"કાર્ડ અનુક્રમણિકા"</string>
     <string name="spoken_emoji_1F4C8" msgid="8007686702282833600">"ઉપર તરફ વલણ સાથેનો ચાર્ટ"</string>
diff --git a/java/res/values-gu-rIN/strings.xml b/java/res/values-gu-rIN/strings.xml
index 62c12f6bf..ceb155e4f 100644
--- a/java/res/values-gu-rIN/strings.xml
+++ b/java/res/values-gu-rIN/strings.xml
@@ -183,7 +183,7 @@
     <string name="install_dict" msgid="180852772562189365">"ઇન્સ્ટોલ કરો"</string>
     <string name="cancel_download_dict" msgid="7843340278507019303">"રદ કરો"</string>
     <string name="delete_dict" msgid="756853268088330054">"કાઢી નાખો"</string>
-    <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"તમારા મોબાઇલ સાધન પર પસંદ કરેલ ભાષા પાસે એક શબ્દકોશ ઉપલબ્ધ છે.&lt;br/&gt; અમે તમને તમારા લખાણ અનુભવને બહેતર બનાવવા માટે <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> શબ્દકોશ &lt;b&gt;ડાઉનલોડ કરવાની&lt;/b&gt; ભલામણ કરીએ છીએ.&lt;br/&gt; &lt;br/&gt; 3G પર ડાઉનલોડમાં એક કે બે મિનિટનો સમય લાગશે. જો તમારી પાસે &lt;b&gt;અસીમિત ડેટા પ્લાન&lt;/b&gt; ન હોય તો શુલ્ક લાગી શકે છે.&lt;br/&gt; જો તમે સુનિશ્ચિત ન હોવ કે તમારી પાસે કયો ડેટા પ્લાન છે, તો અમે ડાઉનલોડ આપમેળે પ્રારંભ કરવા માટે એક Wi-Fi કનેક્શન શોધવાની ભલામણ કરીએ છીએ.&lt;br/&gt; &lt;br/&gt; ટીપ: તમે તમારા મોબાઇલ સાધનનાં મેનૂમાં &lt;b&gt;સેટિંગ્સ&lt;/b&gt;માંના &lt;b&gt;ભાષા &amp; ઇનપુટ&lt;/b&gt; પર જઈને શબ્દકોશ ડાઉનલોડ કરી શકો છો અને દૂર કરી શકો છો."</string>
+    <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"તમારા મોબાઇલ સાધન પર પસંદ કરેલ ભાષા પાસે એક શબ્દકોશ ઉપલબ્ધ છે.&lt;br/&gt; અમે તમને તમારા લખાણ અનુભવને બહેતર બનાવવા માટે <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> શબ્દકોશ &lt;b&gt;ડાઉનલોડ કરવાની&lt;/b&gt; ભલામણ કરીએ છીએ.&lt;br/&gt; &lt;br/&gt; 3G પર ડાઉનલોડમાં એક કે બે મિનિટનો સમય લાગશે. જો તમારી પાસે &lt;b&gt;અસીમિત ડેટા પ્લાન&lt;/b&gt; ન હોય તો શુલ્ક લાગી શકે છે.&lt;br/&gt; જો તમે સુનિશ્ચિત ન હોવ કે તમારી પાસે કયો ડેટા પ્લાન છે, તો અમે ડાઉનલોડ આપમેળે પ્રારંભ કરવા માટે એક Wi-Fi કનેક્શન શોધવાની ભલામણ કરીએ છીએ.&lt;br/&gt; &lt;br/&gt; ટિપ: તમે તમારા મોબાઇલ સાધનનાં મેનૂમાં &lt;b&gt;સેટિંગ્સ&lt;/b&gt;માંના &lt;b&gt;ભાષા &amp; ઇનપુટ&lt;/b&gt; પર જઈને શબ્દકોશ ડાઉનલોડ કરી શકો છો અને દૂર કરી શકો છો."</string>
     <string name="download_over_metered" msgid="1643065851159409546">"હમણાં ડાઉનલોડ કરો (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g>MB)"</string>
     <string name="do_not_download_over_metered" msgid="2176209579313941583">"Wi-Fi પર ડાઉનલોડ કરો"</string>
     <string name="dict_available_notification_title" msgid="4583842811218581658">"<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> માટે એક શબ્દકોશ ઉપલબ્ધ છે"</string>
diff --git a/java/res/values-nl/strings-config-important-notice.xml b/java/res/values-nl/strings-config-important-notice.xml
index a340c99f9..4942e8122 100644
--- a/java/res/values-nl/strings-config-important-notice.xml
+++ b/java/res/values-nl/strings-config-important-notice.xml
@@ -20,5 +20,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="use_personalized_dicts_summary" msgid="590432261305469627">"Suggesties verbeteren met uw communicatie en getypte gegevens"</string>
+    <string name="use_personalized_dicts_summary" msgid="590432261305469627">"Suggesties verbeteren met je communicatie en getypte gegevens"</string>
 </resources>
diff --git a/java/res/values-nl/strings-emoji-descriptions.xml b/java/res/values-nl/strings-emoji-descriptions.xml
index 3b298900b..f740edf97 100644
--- a/java/res/values-nl/strings-emoji-descriptions.xml
+++ b/java/res/values-nl/strings-emoji-descriptions.xml
@@ -587,8 +587,8 @@
     <string name="spoken_emoji_1F4E1" msgid="6269733703719242108">"Satellietantenne"</string>
     <string name="spoken_emoji_1F4E2" msgid="1987535386302883116">"Handluidspreker"</string>
     <string name="spoken_emoji_1F4E3" msgid="5588916572878599224">"Megafoon"</string>
-    <string name="spoken_emoji_1F4E4" msgid="2063561529097749707">"Postvak UIT"</string>
-    <string name="spoken_emoji_1F4E5" msgid="3232462702926143576">"Postvak IN"</string>
+    <string name="spoken_emoji_1F4E4" msgid="2063561529097749707">"Outbox"</string>
+    <string name="spoken_emoji_1F4E5" msgid="3232462702926143576">"Inbox"</string>
     <string name="spoken_emoji_1F4E6" msgid="3399454337197561635">"Pakket"</string>
     <string name="spoken_emoji_1F4E7" msgid="5557136988503873238">"E-mailsymbool"</string>
     <string name="spoken_emoji_1F4E8" msgid="30698793974124123">"Inkomende envelop"</string>
diff --git a/java/res/values-nl/strings-talkback-descriptions.xml b/java/res/values-nl/strings-talkback-descriptions.xml
index 884cf212f..48a3a68ba 100644
--- a/java/res/values-nl/strings-talkback-descriptions.xml
+++ b/java/res/values-nl/strings-talkback-descriptions.xml
@@ -24,7 +24,7 @@
     <string name="spoken_current_text_is" msgid="4240549866156675799">"Huidige tekst is %s"</string>
     <string name="spoken_no_text_entered" msgid="1711276837961785646">"Geen tekst ingevoerd"</string>
     <string name="spoken_auto_correct" msgid="8989324692167993804">"Met <xliff:g id="KEY_NAME">%1$s</xliff:g> wordt <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> gecorrigeerd naar <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
-    <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"Met <xliff:g id="KEY_NAME">%1$s</xliff:g> voert u automatische correctie uit"</string>
+    <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"Met <xliff:g id="KEY_NAME">%1$s</xliff:g> voer je automatische correctie uit"</string>
     <string name="spoken_empty_suggestion" msgid="4250215619373459752">"Geen suggestie"</string>
     <string name="spoken_description_unknown" msgid="5139930082759824442">"Onbekend teken"</string>
     <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml
index e50d6e33c..30dd4bc57 100644
--- a/java/res/values-nl/strings.xml
+++ b/java/res/values-nl/strings.xml
@@ -22,7 +22,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="english_ime_input_options" msgid="3909945612939668554">"Invoeropties"</string>
     <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Contactnamen opzoeken"</string>
-    <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"De spellingcontrole gebruikt items uit uw contactenlijst"</string>
+    <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"De spellingcontrole gebruikt items uit je contactenlijst"</string>
     <string name="vibrate_on_keypress" msgid="5258079494276955460">"Trillen bij toetsaanslag"</string>
     <string name="sound_on_keypress" msgid="6093592297198243644">"Geluid bij toetsaanslag"</string>
     <string name="popup_on_keypress" msgid="123894815723512944">"Pop-up bij toetsaanslag"</string>
@@ -36,14 +36,14 @@
     <string name="enable_split_keyboard" msgid="4177264923999493614">"Gesplitst toetsenbord inschakelen"</string>
     <string name="cloud_sync_title" msgid="8579271074443847055">"Google-toetsenbordsynchronisatie"</string>
     <string name="cloud_sync_summary" msgid="7684887161145650857">"Synchronisatie is ingeschakeld"</string>
-    <string name="cloud_sync_summary_disabled" msgid="4553338970382825796">"Uw persoonlijke woordenboek synchroniseren op meerdere apparaten"</string>
+    <string name="cloud_sync_summary_disabled" msgid="4553338970382825796">"Je persoonlijke woordenboek synchroniseren op meerdere apparaten"</string>
     <string name="sync_now_title" msgid="3088838136743277721">"Nu synchroniseren"</string>
     <string name="clear_sync_data_title" msgid="8582001557037069154">"Cloudgegevens verwijderen"</string>
-    <string name="clear_sync_data_summary" msgid="993477139012576584">"Hiermee worden uw gesynchroniseerde gegevens verwijderd van Google"</string>
-    <string name="clear_sync_data_confirmation" msgid="2811931135574727678">"Wilt u gesynchroniseerde gegevens echt verwijderen uit de cloud?"</string>
+    <string name="clear_sync_data_summary" msgid="993477139012576584">"Hiermee worden je gesynchroniseerde gegevens verwijderd van Google"</string>
+    <string name="clear_sync_data_confirmation" msgid="2811931135574727678">"Wil je gesynchroniseerde gegevens echt verwijderen uit de cloud?"</string>
     <string name="clear_sync_data_ok" msgid="613104067705915132">"Verwijderen"</string>
     <string name="cloud_sync_cancel" msgid="5877481252150919037">"Annuleren"</string>
-    <string name="cloud_sync_opt_in_text" msgid="9176039655776298248">"Uw persoonlijke woordenboek wordt gesynchroniseerd en er wordt een back-up gemaakt op servers van Google. De statistische gegevens voor woordfrequentie kunnen worden verzameld om onze producten te verbeteren. Het verzamelen en gebruik van alle gegevens is in overeenstemming met het "<a href="https://www.google.com/policies/privacy">"Privacybeleid van Google"</a>"."</string>
+    <string name="cloud_sync_opt_in_text" msgid="9176039655776298248">"Je persoonlijke woordenboek wordt gesynchroniseerd en er wordt een back-up gemaakt op servers van Google. De statistische gegevens voor woordfrequentie kunnen worden verzameld om onze producten te verbeteren. Het verzamelen en gebruik van alle gegevens is in overeenstemming met het "<a href="https://www.google.com/policies/privacy">"Privacybeleid van Google"</a>"."</string>
     <string name="add_account_to_enable_sync" msgid="7836932571852055265">"Voeg een Google-account toe om deze functie in te schakelen"</string>
     <string name="cloud_sync_summary_disabled_work_profile" msgid="1381770407303129164">"Synchronisatie is niet beschikbaar voor Google Apps for Business-accounts"</string>
     <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Invoermeth. overschakelen"</string>
@@ -130,7 +130,7 @@
     <string name="save" msgid="7646738597196767214">"Opslaan"</string>
     <string name="subtype_locale" msgid="8576443440738143764">"Taal"</string>
     <string name="keyboard_layout_set" msgid="4309233698194565609">"Lay-out"</string>
-    <string name="custom_input_style_note_message" msgid="8826731320846363423">"U moet uw aangepaste invoerstijl inschakelen voor u deze kunt gebruiken. Wilt u de invoerstijl nu inschakelen?"</string>
+    <string name="custom_input_style_note_message" msgid="8826731320846363423">"Je moet je aangepaste invoerstijl inschakelen voor je deze kunt gebruiken. Wil je de invoerstijl nu inschakelen?"</string>
     <string name="enable" msgid="5031294444630523247">"Inschakelen"</string>
     <string name="not_now" msgid="6172462888202790482">"Niet nu"</string>
     <string name="custom_input_style_already_exists" msgid="8008728952215449707">"Dezelfde invoerstijl bestaat al: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
@@ -146,14 +146,14 @@
     <string name="setup_next_action" msgid="371821437915144603">"Volgende stap"</string>
     <string name="setup_steps_title" msgid="6400373034871816182">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> instellen"</string>
     <string name="setup_step1_title" msgid="3147967630253462315">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> inschakelen"</string>
-    <string name="setup_step1_instruction" msgid="2578631936624637241">"Vink \'<xliff:g id="APPLICATION_NAME">%s</xliff:g>\' aan in \'Instellingen voor taal en invoer\'. De app kan dan worden uitgevoerd op uw apparaat."</string>
+    <string name="setup_step1_instruction" msgid="2578631936624637241">"Vink \'<xliff:g id="APPLICATION_NAME">%s</xliff:g>\' aan in \'Instellingen voor taal en invoer\'. De app kan dan worden uitgevoerd op je apparaat."</string>
     <string name="setup_step1_finished_instruction" msgid="10761482004957994">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> is al ingeschakeld in \'Instellingen voor taal en invoer\', dus deze stap is voltooid. Op naar de volgende!"</string>
     <string name="setup_step1_action" msgid="4366513534999901728">"Inschakelen in \'Instellingen\'"</string>
     <string name="setup_step2_title" msgid="6860725447906690594">"Overschakelen naar <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
     <string name="setup_step2_instruction" msgid="9141481964870023336">"Selecteer vervolgens \'<xliff:g id="APPLICATION_NAME">%s</xliff:g>\' als actieve tekstinvoermethode."</string>
     <string name="setup_step2_action" msgid="1660330307159824337">"Schakelen tussen invoermethoden"</string>
-    <string name="setup_step3_title" msgid="3154757183631490281">"Gefeliciteerd, u kunt nu aan de slag."</string>
-    <string name="setup_step3_instruction" msgid="8025981829605426000">"U kunt nu in al uw favoriete apps typen met <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
+    <string name="setup_step3_title" msgid="3154757183631490281">"Gefeliciteerd, je kunt nu aan de slag."</string>
+    <string name="setup_step3_instruction" msgid="8025981829605426000">"Je kunt nu in al je favoriete apps typen met <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
     <string name="setup_step3_action" msgid="600879797256942259">"Extra talen configureren"</string>
     <string name="setup_finish_action" msgid="276559243409465389">"Voltooid"</string>
     <string name="show_setup_wizard_icon" msgid="5008028590593710830">"App-pictogram weergeven"</string>
@@ -183,7 +183,7 @@
     <string name="install_dict" msgid="180852772562189365">"Installeren"</string>
     <string name="cancel_download_dict" msgid="7843340278507019303">"Annuleren"</string>
     <string name="delete_dict" msgid="756853268088330054">"Verwijderen"</string>
-    <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Er is een woordenboek beschikbaar voor de geselecteerde taal op uw mobiele apparaat.&lt;br/&gt; We raden u aan het woordenboek voor het <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> te &lt;b&gt;downloaden&lt;/b&gt; om uw typvaardigheid te verbeteren.&lt;br/&gt; &lt;br/&gt; De download kan één of twee minuten duren via 3G. Er kunnen kosten worden berekend als u geen &lt;b&gt;onbeperkt gegevensabonnement&lt;/b&gt; heeft.&lt;br/&gt; Als u niet zeker weet welk gegevensabonnement u heeft, raden we u aan een wifi-verbinding te zoeken om de download automatisch te starten.&lt;br/&gt; &lt;br/&gt; Tip: u kunt woordenboeken downloaden en verwijderen via &lt;b&gt;Taal en invoer&lt;/b&gt; in het menu &lt;b&gt;Instellingen&lt;/b&gt; van uw mobiele apparaat."</string>
+    <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Er is een woordenboek beschikbaar voor de geselecteerde taal op je mobiele apparaat.&lt;br/&gt; We raden je aan het woordenboek voor het <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> te &lt;b&gt;downloaden&lt;/b&gt; om je typvaardigheid te verbeteren.&lt;br/&gt; &lt;br/&gt; De download kan één of twee minuten duren via 3G. Er kunnen kosten worden berekend als je geen &lt;b&gt;onbeperkt gegevensabonnement&lt;/b&gt; hebt.&lt;br/&gt; Als je niet zeker weet welk gegevensabonnement je hebt, raden we je aan een wifi-verbinding te zoeken om de download automatisch te starten.&lt;br/&gt; &lt;br/&gt; Tip: je kunt woordenboeken downloaden en verwijderen via &lt;b&gt;Taal en invoer&lt;/b&gt; in het menu &lt;b&gt;Instellingen&lt;/b&gt; van je mobiele apparaat."</string>
     <string name="download_over_metered" msgid="1643065851159409546">"Nu downloaden (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
     <string name="do_not_download_over_metered" msgid="2176209579313941583">"Downloaden via wifi"</string>
     <string name="dict_available_notification_title" msgid="4583842811218581658">"Er is een woordenboek beschikbaar voor het <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
@@ -204,7 +204,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="3765774633869590352">"Woord bewerken"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="6812255903472456302">"Bewerken"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="8142932447689461181">"Verwijderen"</string>
-    <string name="user_dict_settings_empty_text" msgid="558499587532668203">"Er staan geen woorden in het gebruikerswoordenboek. U kunt een woord toevoegen door op de knop \'Toevoegen\' (+) te tikken."</string>
+    <string name="user_dict_settings_empty_text" msgid="558499587532668203">"Er staan geen woorden in het gebruikerswoordenboek. Je kunt een woord toevoegen door op de knop \'Toevoegen\' (+) te tikken."</string>
     <string name="user_dict_settings_all_languages" msgid="8276126583216298886">"Voor alle talen"</string>
     <string name="user_dict_settings_more_languages" msgid="7131268499685180461">"Meer talen…"</string>
     <string name="user_dict_settings_delete" msgid="110413335187193859">"Verwijderen"</string>
diff --git a/java/res/values-ro/strings-emoji-descriptions.xml b/java/res/values-ro/strings-emoji-descriptions.xml
index 2ac84e5a0..412a97a60 100644
--- a/java/res/values-ro/strings-emoji-descriptions.xml
+++ b/java/res/values-ro/strings-emoji-descriptions.xml
@@ -45,7 +45,7 @@
     <string name="spoken_emoji_23EA" msgid="2251396938087774944">"Triunghi dublu, negru, orientat spre stânga"</string>
     <string name="spoken_emoji_23EB" msgid="3746885195641491865">"Triunghi dublu, negru, orientat în sus"</string>
     <string name="spoken_emoji_23EC" msgid="7852372752901163416">"Triunghi dublu, negru, orientat în jos"</string>
-    <string name="spoken_emoji_23F0" msgid="8474219588750627870">"Ceas deşteptător"</string>
+    <string name="spoken_emoji_23F0" msgid="8474219588750627870">"Ceas deșteptător"</string>
     <string name="spoken_emoji_23F3" msgid="166900119581024371">"Clepsidră cu nisip"</string>
     <string name="spoken_emoji_24C2" msgid="3948348737566038470">"Majuscula „M”, din alfabetul latin, încercuită"</string>
     <string name="spoken_emoji_25AA" msgid="7865181015100227349">"Pătrat mic negru"</string>
@@ -75,7 +75,7 @@
     <string name="spoken_emoji_2650" msgid="4832481156714796163">"Săgetător"</string>
     <string name="spoken_emoji_2651" msgid="840953134601595090">"Capricorn"</string>
     <string name="spoken_emoji_2652" msgid="3586925968718775281">"Vărsător"</string>
-    <string name="spoken_emoji_2653" msgid="8420547731496254492">"Peşti"</string>
+    <string name="spoken_emoji_2653" msgid="8420547731496254492">"Pești"</string>
     <string name="spoken_emoji_2660" msgid="4541170554542412536">"Pică neagră"</string>
     <string name="spoken_emoji_2663" msgid="3669352721942285724">"Treflă neagră"</string>
     <string name="spoken_emoji_2665" msgid="6347941599683765843">"Inimă neagra"</string>
@@ -175,7 +175,7 @@
     <string name="spoken_emoji_1F250" msgid="6586943922806727907">"Caracter ideografic „Avantaj” în pătrat"</string>
     <string name="spoken_emoji_1F251" msgid="9099032855993346948">"Caracter ideografic „Acord” în pătrat"</string>
     <string name="spoken_emoji_1F300" msgid="4720098285295840383">"Ciclon"</string>
-    <string name="spoken_emoji_1F301" msgid="3601962477653752974">"Ceaţă"</string>
+    <string name="spoken_emoji_1F301" msgid="3601962477653752974">"Ceață"</string>
     <string name="spoken_emoji_1F302" msgid="3404357123421753593">"Umbrelă închisă"</string>
     <string name="spoken_emoji_1F303" msgid="3899301321538188206">"Noapte cu stele"</string>
     <string name="spoken_emoji_1F304" msgid="2767148930689050040">"Răsărit peste munți"</string>
@@ -356,7 +356,7 @@
     <string name="spoken_emoji_1F3E8" msgid="5864918444350599907">"Hotel"</string>
     <string name="spoken_emoji_1F3E9" msgid="7830416185375326938">"Hoteluri pentru îndrăgostiți"</string>
     <string name="spoken_emoji_1F3EA" msgid="5081084413084360479">"Alimentară"</string>
-    <string name="spoken_emoji_1F3EB" msgid="7010966528205150525">"Şcoală"</string>
+    <string name="spoken_emoji_1F3EB" msgid="7010966528205150525">"Școală"</string>
     <string name="spoken_emoji_1F3EC" msgid="4845978861878295154">"Magazin universal"</string>
     <string name="spoken_emoji_1F3ED" msgid="3980316226665215370">"Fabrică"</string>
     <string name="spoken_emoji_1F3EE" msgid="1253964276770550248">"Felinar Izakaya"</string>
@@ -379,7 +379,7 @@
     <string name="spoken_emoji_1F40F" msgid="7834336676729040395">"Berbec"</string>
     <string name="spoken_emoji_1F410" msgid="8686765722255775031">"Capră"</string>
     <string name="spoken_emoji_1F411" msgid="3585715397876383525">"Oaie"</string>
-    <string name="spoken_emoji_1F412" msgid="4924794582980077838">"Maimuţă"</string>
+    <string name="spoken_emoji_1F412" msgid="4924794582980077838">"Maimuță"</string>
     <string name="spoken_emoji_1F413" msgid="1460475310405677377">"Cocoș"</string>
     <string name="spoken_emoji_1F414" msgid="5857296282631892219">"Pui"</string>
     <string name="spoken_emoji_1F415" msgid="5920041074892949527">"Câine"</string>
@@ -479,7 +479,7 @@
     <string name="spoken_emoji_1F475" msgid="7280323988642212761">"Bătrână"</string>
     <string name="spoken_emoji_1F476" msgid="4713322657821088296">"Bebeluș"</string>
     <string name="spoken_emoji_1F477" msgid="2197036131029221370">"Muncitor în construcții"</string>
-    <string name="spoken_emoji_1F478" msgid="7245521193493488875">"Prinţesă"</string>
+    <string name="spoken_emoji_1F478" msgid="7245521193493488875">"Prințesă"</string>
     <string name="spoken_emoji_1F479" msgid="6876475321015553972">"Căpcăun japonez"</string>
     <string name="spoken_emoji_1F47A" msgid="3900813633102703571">"Goblin japonez"</string>
     <string name="spoken_emoji_1F47B" msgid="2608250873194079390">"Fantomă"</string>
diff --git a/java/res/values-ro/strings.xml b/java/res/values-ro/strings.xml
index 7c4a8f1ff..83ba4f51b 100644
--- a/java/res/values-ro/strings.xml
+++ b/java/res/values-ro/strings.xml
@@ -55,8 +55,8 @@
     <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Prestabilit"</string>
     <string name="abbreviation_unit_milliseconds" msgid="8700286094028323363">"<xliff:g id="MILLISECONDS">%s</xliff:g> msec."</string>
     <string name="settings_system_default" msgid="6268225104743331821">"Valoare prestabilită"</string>
-    <string name="use_contacts_dict" msgid="4435317977804180815">"Sugeraţi nume din Agendă"</string>
-    <string name="use_contacts_dict_summary" msgid="6599983334507879959">"Utilizaţi numele din Agendă pentru sugestii și corecţii"</string>
+    <string name="use_contacts_dict" msgid="4435317977804180815">"Sugerați nume din Agendă"</string>
+    <string name="use_contacts_dict_summary" msgid="6599983334507879959">"Utilizaţi numele din Agendă pentru sugestii și corecții"</string>
     <string name="use_personalized_dicts" msgid="5167396352105467626">"Sugestii personalizate"</string>
     <string name="enable_metrics_logging" msgid="5506372337118822837">"Îmbunătățiți <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
     <string name="use_double_space_period" msgid="8781529969425082860">"Inserează punct spațiu"</string>
@@ -64,14 +64,14 @@
     <string name="auto_cap" msgid="1719746674854628252">"Scriere automată cu majuscule"</string>
     <string name="auto_cap_summary" msgid="7934452761022946874">"Scrie cu majusculă primul cuvânt din fiecare propoziţie"</string>
     <string name="edit_personal_dictionary" msgid="3996910038952940420">"Dicționar personal"</string>
-    <string name="configure_dictionaries_title" msgid="4238652338556902049">"Dicţionare suplimentare"</string>
+    <string name="configure_dictionaries_title" msgid="4238652338556902049">"Dicționare suplimentare"</string>
     <string name="main_dictionary" msgid="4798763781818361168">"Dicţionar principal"</string>
     <string name="prefs_show_suggestions" msgid="8026799663445531637">"Afişaţi sugestii de corectare"</string>
     <string name="prefs_show_suggestions_summary" msgid="1583132279498502825">"Afișează sugestii de cuvinte în timpul introducerii textului"</string>
     <string name="prefs_block_potentially_offensive_title" msgid="5078480071057408934">"Blocați cuvintele jignitoare"</string>
     <string name="prefs_block_potentially_offensive_summary" msgid="2371835479734991364">"Nu se sugerează cuvinte potențial jignitoare"</string>
     <string name="auto_correction" msgid="7630720885194996950">"Autocorectare"</string>
-    <string name="auto_correction_summary" msgid="5625751551134658006">"Corectare automată cuvinte prin bară spaţiu/semne punctuaţie"</string>
+    <string name="auto_correction_summary" msgid="5625751551134658006">"Corectare automată cuvinte prin bară spaţiu/semne punctuație"</string>
     <string name="auto_correction_threshold_mode_off" msgid="8470882665417944026">"Dezactivată"</string>
     <string name="auto_correction_threshold_mode_modest" msgid="8788366690620799097">"Moderată"</string>
     <string name="auto_correction_threshold_mode_aggressive" msgid="7319007299148899623">"Exigentă"</string>
@@ -80,7 +80,7 @@
     <string name="bigram_prediction_summary" msgid="3896362682751109677">"Utilizează cuvântul anterior pentru sugestii"</string>
     <string name="gesture_input" msgid="826951152254563827">"Activați tastarea gestuală"</string>
     <string name="gesture_input_summary" msgid="9180350639305731231">"Introduceţi un cuvânt glisând uşor între litere"</string>
-    <string name="gesture_preview_trail" msgid="3802333369335722221">"Se afişează urma gestului"</string>
+    <string name="gesture_preview_trail" msgid="3802333369335722221">"Se afișează urma gestului"</string>
     <string name="gesture_floating_preview_text" msgid="4443240334739381053">"Sugestie flotantă dinamică"</string>
     <string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Afişaţi cuvântul sugerat când utilizaţi gesturi"</string>
     <string name="gesture_space_aware" msgid="2078291600664682496">"Gest expresie"</string>
@@ -130,10 +130,10 @@
     <string name="save" msgid="7646738597196767214">"Salvaţi"</string>
     <string name="subtype_locale" msgid="8576443440738143764">"Limbă"</string>
     <string name="keyboard_layout_set" msgid="4309233698194565609">"Aspect"</string>
-    <string name="custom_input_style_note_message" msgid="8826731320846363423">"Stilul de introducere personalizat trebuie să fie activat pentru a-l utiliza. Îl activaţi acum?"</string>
-    <string name="enable" msgid="5031294444630523247">"Activaţi"</string>
+    <string name="custom_input_style_note_message" msgid="8826731320846363423">"Stilul de introducere personalizat trebuie să fie activat pentru a-l utiliza. Îl activați acum?"</string>
+    <string name="enable" msgid="5031294444630523247">"Activați"</string>
     <string name="not_now" msgid="6172462888202790482">"Nu acum"</string>
-    <string name="custom_input_style_already_exists" msgid="8008728952215449707">"Acelaşi stil de introducere există deja: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
+    <string name="custom_input_style_already_exists" msgid="8008728952215449707">"Același stil de introducere există deja: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
     <string name="prefs_keypress_vibration_duration_settings" msgid="7918341459947439226">"Vibrare după apăsarea tastei"</string>
     <string name="prefs_keypress_sound_volume_settings" msgid="6027007337036891623">"Sunet la apăsarea tastelor"</string>
     <string name="prefs_key_longpress_timeout_settings" msgid="6102240298932897873">"Timpul apăsării lungi a tastei"</string>
diff --git a/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java b/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java
index a02203d31..0517bc814 100644
--- a/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java
+++ b/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java
@@ -32,6 +32,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -956,14 +957,23 @@ public final class UpdateHandler {
         WordListMetadata metadata = WordListMetadata.createFromContentValues(installCandidate);
         actions.add(new ActionBatch.StartDownloadAction(clientId, metadata));
         final String localeString = installCandidate.getAsString(MetadataDbHelper.LOCALE_COLUMN);
+
         // We are in a content provider: we can't do any UI at all. We have to defer the displaying
         // itself to the service. Also, we only display this when the user does not have a
-        // dictionary for this language already.
-        final Intent intent = new Intent();
-        intent.setClass(context, DictionaryService.class);
-        intent.setAction(DictionaryService.SHOW_DOWNLOAD_TOAST_INTENT_ACTION);
-        intent.putExtra(DictionaryService.LOCALE_INTENT_ARGUMENT, localeString);
-        context.startService(intent);
+        // dictionary for this language already. During setup wizard, however, this UI is
+        // suppressed.
+        final boolean deviceProvisioned = Settings.Global.getInt(context.getContentResolver(),
+                Settings.Global.DEVICE_PROVISIONED, 0) != 0;
+        if (deviceProvisioned) {
+            final Intent intent = new Intent();
+            intent.setClass(context, DictionaryService.class);
+            intent.setAction(DictionaryService.SHOW_DOWNLOAD_TOAST_INTENT_ACTION);
+            intent.putExtra(DictionaryService.LOCALE_INTENT_ARGUMENT, localeString);
+            context.startService(intent);
+        } else {
+            Log.i(TAG, "installIfNeverRequested() : Don't show download toast");
+        }
+
         Log.i(TAG, "installIfNeverRequested() : StartDownloadAction for " + metadata);
         actions.execute(context, new LogProblemReporter(TAG));
     }