Snap for 4399693 from fde28ca6e5f4fd900524912d0e06de51ee846dd2 to oc-mr1-release

Change-Id: I6b0af16957f9a725d46cb49cd6f96798568604f2
diff --git a/java/res/values-bs/strings-talkback-descriptions.xml b/java/res/values-bs/strings-talkback-descriptions.xml
index 2381067..776a97d 100644
--- a/java/res/values-bs/strings-talkback-descriptions.xml
+++ b/java/res/values-bs/strings-talkback-descriptions.xml
@@ -62,7 +62,7 @@
     <string name="keyboard_mode_im" msgid="3812086215529493501">"poruke"</string>
     <string name="keyboard_mode_number" msgid="5395042245837996809">"broj"</string>
     <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefon"</string>
-    <string name="keyboard_mode_text" msgid="9138789594969187494">"Pošalji tekstualnu poruku"</string>
+    <string name="keyboard_mode_text" msgid="9138789594969187494">"Pošalji SMS"</string>
     <string name="keyboard_mode_time" msgid="8558297845514402675">"vrijeme"</string>
     <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
     <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Nedavni"</string>
diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml
index 6fdf6a3..2c3546c 100644
--- a/java/res/values-da/strings.xml
+++ b/java/res/values-da/strings.xml
@@ -107,7 +107,7 @@
     <string name="subtype_es_US" msgid="5583145191430180200">"Spansk (USA)"</string>
     <string name="subtype_hi_ZZ" msgid="8860448146262798623">"Hinglish"</string>
     <string name="subtype_sr_ZZ" msgid="9059219552986034343">"Serbisk (latinsk)"</string>
-    <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Engelsk (UK) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+    <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Engelsk (Storbritannien) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
     <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Engelsk (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
     <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Spansk (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
     <string name="subtype_with_layout_hi_ZZ" msgid="6827402953860547044">"Hinglish (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml
index e22591c..c8df113 100644
--- a/java/res/values-es-rUS/strings.xml
+++ b/java/res/values-es-rUS/strings.xml
@@ -78,7 +78,7 @@
     <string name="auto_correction_threshold_mode_very_aggressive" msgid="1853309024129480416">"Muy intensa"</string>
     <string name="bigram_prediction" msgid="1084449187723948550">"Suger. de próxima palabra"</string>
     <string name="bigram_prediction_summary" msgid="3896362682751109677">"Usar la palabra anterior para hacer sugerencias"</string>
-    <string name="gesture_input" msgid="826951152254563827">"Activar escritura gestual"</string>
+    <string name="gesture_input" msgid="826951152254563827">"Habilitar escritura gestual"</string>
     <string name="gesture_input_summary" msgid="9180350639305731231">"Ingresa una palabra deslizando el dedo sobre las letras."</string>
     <string name="gesture_preview_trail" msgid="3802333369335722221">"Mostrar recorrido de gesto"</string>
     <string name="gesture_floating_preview_text" msgid="4443240334739381053">"Vista previa dinámica flotante"</string>
diff --git a/java/res/values-hi/strings.xml b/java/res/values-hi/strings.xml
index c7e7ab1..6cbeffc 100644
--- a/java/res/values-hi/strings.xml
+++ b/java/res/values-hi/strings.xml
@@ -98,7 +98,7 @@
     <string name="switch_accounts" msgid="3321216593719006162">"खाते स्‍विच करें"</string>
     <string name="no_accounts_selected" msgid="2073821619103904330">"कोई खाता नहीं चुना गया"</string>
     <string name="account_selected" msgid="2846876462199625974">"वर्तमान में <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g> का उपयोग कर रहा है"</string>
-    <string name="account_select_ok" msgid="9141195141763227797">"ठीक"</string>
+    <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>
diff --git a/java/res/values-pa/strings-config-important-notice.xml b/java/res/values-pa/strings-config-important-notice.xml
index dd954aa..c6528ad 100644
--- a/java/res/values-pa/strings-config-important-notice.xml
+++ b/java/res/values-pa/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">"ਸੁਝਾਵਾਂ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਆਪਣੀਆਂ ਗੱਲਬਾਤਾਂ ਅਤੇ ਟਾਈਪ ਕੀਤੇ ਡੈਟਾ ਤੋਂ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+    <string name="use_personalized_dicts_summary" msgid="590432261305469627">"ਸੁਝਾਵਾਂ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਆਪਣੀਆਂ ਗੱਲਬਾਤਾਂ ਅਤੇ ਟਾਈਪ ਕੀਤੇ  ਡਾਟਾ  ਤੋਂ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
 </resources>
diff --git a/java/res/values-pa/strings-talkback-descriptions.xml b/java/res/values-pa/strings-talkback-descriptions.xml
index 96fc610..39b6805 100644
--- a/java/res/values-pa/strings-talkback-descriptions.xml
+++ b/java/res/values-pa/strings-talkback-descriptions.xml
@@ -48,7 +48,7 @@
     <string name="spoken_description_action_next" msgid="431761808119616962">"ਅੱਗੇ"</string>
     <string name="spoken_description_action_previous" msgid="2919072174697865110">"ਪਿਛਲਾ"</string>
     <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"ਸ਼ਿਫਟ ਕੁੰਜੀ ਚਾਲੂ"</string>
-    <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"ਕੈਪਸ ਲੌਕ ਸਮਰਥਿਤ"</string>
+    <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"ਕੈਪਸ  ਲਾਕ  ਸਮਰਥਿਤ"</string>
     <string name="spoken_description_mode_symbol" msgid="111186851131446691">"ਚਿੰਨ੍ਹ ਮੋਡ"</string>
     <string name="spoken_description_mode_symbol_shift" msgid="4305607977537665389">"ਹੋਰ ਚਿੰਨ੍ਹ ਮੋਡ"</string>
     <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"ਅੱਖਰ ਮੋਡ"</string>
diff --git a/java/res/values-pa/strings.xml b/java/res/values-pa/strings.xml
index e2532bf..bcce742 100644
--- a/java/res/values-pa/strings.xml
+++ b/java/res/values-pa/strings.xml
@@ -39,7 +39,7 @@
     <string name="cloud_sync_summary_disabled" msgid="4553338970382825796">"ਡਿਵਾਈਸਾਂ ਵਿੱਚ ਆਪਣਾ ਨਿੱਜੀ ਸ਼ਬਦਕੋਸ਼ ਸਿੰਕ ਕਰੋ"</string>
     <string name="sync_now_title" msgid="3088838136743277721">"ਹੁਣ ਸਮਕਾਲੀਕਰਨ ਕਰੋ"</string>
     <string name="clear_sync_data_title" msgid="8582001557037069154">"ਕਲਾਉਡ ਡਾਟਾ ਮਿਟਾਓ"</string>
-    <string name="clear_sync_data_summary" msgid="993477139012576584">"Google ਤੋਂ ਤੁਹਾਡਾ ਸਿੰਕ ਕੀਤਾ ਡੈਟਾ ਮਿਟਾਉਂਦਾ ਹੈ"</string>
+    <string name="clear_sync_data_summary" msgid="993477139012576584">"Google ਤੋਂ ਤੁਹਾਡਾ ਸਿੰਕ ਕੀਤਾ  ਡਾਟਾ  ਮਿਟਾਉਂਦਾ ਹੈ"</string>
     <string name="clear_sync_data_confirmation" msgid="2811931135574727678">"ਤੁਹਾਡਾ ਸਿੰਕ ਕੀਤਾ ਡਾਟਾ ਕਲਾਊਡ ਤੋਂ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ। ਕੀ ਤੁਸੀਂ ਨਿਸ਼ਚਿਤ ਹੋ?"</string>
     <string name="clear_sync_data_ok" msgid="613104067705915132">"ਮਿਟਾਓ"</string>
     <string name="cloud_sync_cancel" msgid="5877481252150919037">"ਰੱਦ ਕਰੋ"</string>
@@ -174,7 +174,7 @@
     <string name="cannot_connect_to_dict_service" msgid="9216933695765732398">"ਸ਼ਬਦਕੋਸ਼ ਸੇਵਾ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ"</string>
     <string name="no_dictionaries_available" msgid="8039920716566132611">"ਕੋਈ ਸ਼ਬਦਕੋਸ਼ ਉਪਲਬਧ ਨਹੀਂ"</string>
     <string name="check_for_updates_now" msgid="8087688440916388581">"ਤਾਜ਼ਾ"</string>
-    <string name="last_update" msgid="730467549913588780">"ਆਖਰੀ ਵਾਰ ਅਪਡੇਟ ਕੀਤਾ"</string>
+    <string name="last_update" msgid="730467549913588780">"ਆਖਰੀ ਵਾਰ ਅੱਪਡੇਟ ਕੀਤਾ"</string>
     <string name="message_updating" msgid="4457761393932375219">"ਅਪਡੇਟਸ ਦੀ ਜਾਂਚ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="message_loading" msgid="5638680861387748936">"ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…"</string>
     <string name="main_dict_description" msgid="3072821352793492143">"ਮੁੱਖ ਸ਼ਬਦਕੋਸ਼"</string>
diff --git a/java/res/values-zh-rHK/strings.xml b/java/res/values-zh-rHK/strings.xml
index 232ff59..29b6812 100644
--- a/java/res/values-zh-rHK/strings.xml
+++ b/java/res/values-zh-rHK/strings.xml
@@ -157,7 +157,7 @@
     <string name="setup_step3_action" msgid="600879797256942259">"設定其他語言"</string>
     <string name="setup_finish_action" msgid="276559243409465389">"完成"</string>
     <string name="show_setup_wizard_icon" msgid="5008028590593710830">"顯示應用程式圖示"</string>
-    <string name="show_setup_wizard_icon_summary" msgid="4119998322536880213">"在應用程式啟動器中顯示圖示"</string>
+    <string name="show_setup_wizard_icon_summary" msgid="4119998322536880213">"在啟動器中顯示圖示"</string>
     <string name="app_name" msgid="6320102637491234792">"字典供應商"</string>
     <string name="dictionary_provider_name" msgid="3027315045397363079">"字典供應商"</string>
     <string name="dictionary_service_name" msgid="6237472350693511448">"字典服務"</string>