summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-12-15 03:00:21 -0700
committerLinux Build Service Account <lnxbuild@localhost>2016-12-15 03:00:21 -0700
commit99cbeb464390a85fc5df129b1937e965c7d720c7 (patch)
treed05c9685eaa9051c3119ce0105bf1881e3178885
parent001e968e505cf2fd0964e2c3c62be0c7952be7aa (diff)
parent25066915746f0da96afba44777f8eb6b3bfed87c (diff)
downloadandroid_packages_inputmethods_LatinIME-99cbeb464390a85fc5df129b1937e965c7d720c7.tar.gz
android_packages_inputmethods_LatinIME-99cbeb464390a85fc5df129b1937e965c7d720c7.tar.bz2
android_packages_inputmethods_LatinIME-99cbeb464390a85fc5df129b1937e965c7d720c7.zip
Merge 25066915746f0da96afba44777f8eb6b3bfed87c on remote branch
Change-Id: I1810ad6d67088622f148f0801d45eb51f922b64c
-rw-r--r--java/res/values-b+sr+Latn/strings-emoji-descriptions.xml2
-rw-r--r--java/res/values-bs-rBA/strings-action-keys.xml2
-rw-r--r--java/res/values-bs-rBA/strings-talkback-descriptions.xml2
-rw-r--r--java/res/values-bs-rBA/strings.xml4
-rw-r--r--java/res/values-ca/strings-talkback-descriptions.xml2
-rw-r--r--java/res/values-es-rUS/strings.xml2
-rw-r--r--java/res/values-ja/strings-emoji-descriptions.xml4
-rw-r--r--java/res/values-kn-rIN/strings.xml6
-rw-r--r--java/res/values-ko/strings.xml2
-rw-r--r--java/res/values-mn-rMN/strings.xml2
-rw-r--r--java/res/values-mr-rIN/strings.xml2
-rw-r--r--java/res/values-my-rMM/strings-action-keys.xml2
-rw-r--r--java/res/values-my-rMM/strings-emoji-descriptions.xml2
-rw-r--r--java/res/values-my-rMM/strings-talkback-descriptions.xml2
-rw-r--r--java/res/values-my-rMM/strings.xml18
-rw-r--r--java/res/values-sk/strings-emoji-descriptions.xml2
-rw-r--r--java/res/values-sr/strings-emoji-descriptions.xml2
-rw-r--r--java/res/values-tl/strings.xml2
-rw-r--r--java/res/values-zh-rCN/important_notice_strings.xml34
-rw-r--r--java/res/values-zh-rTW/strings-emoji-descriptions.xml2
-rw-r--r--java/res/values-zh-rTW/strings-talkback-descriptions.xml2
21 files changed, 66 insertions, 32 deletions
diff --git a/java/res/values-b+sr+Latn/strings-emoji-descriptions.xml b/java/res/values-b+sr+Latn/strings-emoji-descriptions.xml
index 0c0dc3697..67373724f 100644
--- a/java/res/values-b+sr+Latn/strings-emoji-descriptions.xml
+++ b/java/res/values-b+sr+Latn/strings-emoji-descriptions.xml
@@ -651,7 +651,7 @@
<string name="spoken_emoji_1F449" msgid="4764447975177805991">"Spoljni deo bele šake sa kažiprstom nadesno"</string>
<string name="spoken_emoji_1F44A" msgid="7197417095486424841">"Pesnica"</string>
<string name="spoken_emoji_1F44B" msgid="1975968945250833117">"Ruka koja maše"</string>
- <string name="spoken_emoji_1F44C" msgid="3185919567897876562">"Znak rukom „U redu“"</string>
+ <string name="spoken_emoji_1F44C" msgid="3185919567897876562">"Znak rukom „Potvrdi“"</string>
<string name="spoken_emoji_1F44D" msgid="6182553970602667815">"Palac okrenut nagore"</string>
<string name="spoken_emoji_1F44E" msgid="8030851867365111809">"Palac okrenut nadole"</string>
<string name="spoken_emoji_1F44F" msgid="5148753662268213389">"Tapšanje"</string>
diff --git a/java/res/values-bs-rBA/strings-action-keys.xml b/java/res/values-bs-rBA/strings-action-keys.xml
index d7b8f4a4d..df3c80ac4 100644
--- a/java/res/values-bs-rBA/strings-action-keys.xml
+++ b/java/res/values-bs-rBA/strings-action-keys.xml
@@ -21,7 +21,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="label_go_key" msgid="4033615332628671065">"Kreni"</string>
- <string name="label_next_key" msgid="5586407279258592635">"Dalje"</string>
+ <string name="label_next_key" msgid="5586407279258592635">"Naprijed"</string>
<string name="label_previous_key" msgid="1421141755779895275">"Nazad"</string>
<string name="label_done_key" msgid="7564866296502630852">"Gotovo"</string>
<string name="label_send_key" msgid="482252074224462163">"Pošalji"</string>
diff --git a/java/res/values-bs-rBA/strings-talkback-descriptions.xml b/java/res/values-bs-rBA/strings-talkback-descriptions.xml
index 3fff6bbca..fdaaf6dcf 100644
--- a/java/res/values-bs-rBA/strings-talkback-descriptions.xml
+++ b/java/res/values-bs-rBA/strings-talkback-descriptions.xml
@@ -46,7 +46,7 @@
<string name="spoken_description_search" msgid="5099937658231911288">"Search"</string>
<string name="spoken_description_dot" msgid="5644176501632325560">"Dot"</string>
<string name="spoken_description_language_switch" msgid="6818666779313544553">"Switch language"</string>
- <string name="spoken_description_action_next" msgid="431761808119616962">"Next"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Naprijed"</string>
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Previous"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift enabled"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock enabled"</string>
diff --git a/java/res/values-bs-rBA/strings.xml b/java/res/values-bs-rBA/strings.xml
index 807e81487..c45b131ba 100644
--- a/java/res/values-bs-rBA/strings.xml
+++ b/java/res/values-bs-rBA/strings.xml
@@ -76,7 +76,7 @@
<string name="auto_correction_threshold_mode_modest" msgid="8788366690620799097">"Srednje"</string>
<string name="auto_correction_threshold_mode_aggressive" msgid="7319007299148899623">"Napadno"</string>
<string name="auto_correction_threshold_mode_very_aggressive" msgid="1853309024129480416">"Veoma napadno"</string>
- <string name="bigram_prediction" msgid="1084449187723948550">"Predlaganje naredne riječi"</string>
+ <string name="bigram_prediction" msgid="1084449187723948550">"Prijedlozi za sljedeću riječ"</string>
<string name="bigram_prediction_summary" msgid="3896362682751109677">"Prilikom odlučivanja koristi prethodno"</string>
<string name="gesture_input" msgid="826951152254563827">"Omogućite kucanje pokretima"</string>
<string name="gesture_input_summary" msgid="9180350639305731231">"Unesite riječ klizanjem prstom preko slova"</string>
@@ -150,7 +150,7 @@
<string name="setup_step1_finished_instruction" msgid="8701441895377434947">"Aplikacija <xliff:g id="APPLICATION_NAME">%s</xliff:g> je već omogućena u vašim postavkama sekcije Jezici i unos, tako da je ovaj korak završen. Pređite na sljedeći!"</string>
<string name="setup_step1_action" msgid="4366513534999901728">"Omogući u Postavkama"</string>
<string name="setup_step2_title" msgid="6860725447906690594">"Prebacite se na aplikaciju <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step2_instruction" msgid="9141481964870023336">"Zatim, odaberite aplikaciju \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" kao vaš aktivni način unosa teksta."</string>
+ <string name="setup_step2_instruction" msgid="9141481964870023336">"Zatim odaberite aplikaciju \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" kao vaš aktivni način unosa teksta."</string>
<string name="setup_step2_action" msgid="1660330307159824337">"Zamijeni načine unosa"</string>
<string name="setup_step3_title" msgid="3154757183631490281">"Odlično, sve je spremno!"</string>
<string name="setup_step3_instruction" msgid="8025981829605426000">"Sada možete kucati u svim omiljenim aplikacijama pomoću aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
diff --git a/java/res/values-ca/strings-talkback-descriptions.xml b/java/res/values-ca/strings-talkback-descriptions.xml
index 61c3ca037..0464601f4 100644
--- a/java/res/values-ca/strings-talkback-descriptions.xml
+++ b/java/res/values-ca/strings-talkback-descriptions.xml
@@ -74,7 +74,7 @@
<string name="spoken_descrption_emoji_category_flags" msgid="5971573825866381472">"Banderes"</string>
<string name="spoken_descrption_emoji_category_eight_smiley_people" msgid="5682663819532433464">"Somriures i persones"</string>
<string name="spoken_descrption_emoji_category_eight_animals_nature" msgid="5844950234883716704">"Animals i naturalesa"</string>
- <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"Alimentació i begudes"</string>
+ <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"Menjar i beure"</string>
<string name="spoken_descrption_emoji_category_eight_travel_places" msgid="3834085499381434611">"Viatges i llocs"</string>
<string name="spoken_descrption_emoji_category_eight_activity" msgid="4795281669042975993">"Activitat"</string>
<string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emoticones"</string>
diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml
index aca5e93d0..f4caab63b 100644
--- a/java/res/values-es-rUS/strings.xml
+++ b/java/res/values-es-rUS/strings.xml
@@ -79,7 +79,7 @@
<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_summary" msgid="9180350639305731231">"Ingresa una palabra al deslizarte sobre las letras."</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>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Mira la palabra sugerida mientras haces gestos"</string>
diff --git a/java/res/values-ja/strings-emoji-descriptions.xml b/java/res/values-ja/strings-emoji-descriptions.xml
index 074b1dcbf..f699980b8 100644
--- a/java/res/values-ja/strings-emoji-descriptions.xml
+++ b/java/res/values-ja/strings-emoji-descriptions.xml
@@ -747,8 +747,8 @@
<string name="spoken_emoji_1F4A9" msgid="1240958472788430032">"うんち"</string>
<string name="spoken_emoji_1F4AA" msgid="8427525538635146416">"力こぶ"</string>
<string name="spoken_emoji_1F4AB" msgid="5484114759939427459">"クラクラのマーク"</string>
- <string name="spoken_emoji_1F4AC" msgid="5571196638219612682">"吹き出し"</string>
- <string name="spoken_emoji_1F4AD" msgid="353174619257798652">"吹き出しコメント"</string>
+ <string name="spoken_emoji_1F4AC" msgid="5571196638219612682">"ふきだし"</string>
+ <string name="spoken_emoji_1F4AD" msgid="353174619257798652">"ふきだしコメント"</string>
<string name="spoken_emoji_1F4AE" msgid="1223142786927162641">"白い花"</string>
<string name="spoken_emoji_1F4AF" msgid="3526278354452138397">"100点のマーク"</string>
<string name="spoken_emoji_1F4B0" msgid="4124102195175124156">"ドル袋"</string>
diff --git a/java/res/values-kn-rIN/strings.xml b/java/res/values-kn-rIN/strings.xml
index 84832f184..226ebd36a 100644
--- a/java/res/values-kn-rIN/strings.xml
+++ b/java/res/values-kn-rIN/strings.xml
@@ -89,7 +89,7 @@
<string name="voice_input_disabled_summary" msgid="6323489602945135165">"ಯಾವುದೇ ಧ್ವನಿ ಇನ್‌ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿಲ್ಲ. ಭಾಷೆಗಳು &amp; ಇನ್‌ಪುಟ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಪರಿಶೀಲಿಸಿ."</string>
<string name="configure_input_method" msgid="373356270290742459">"ಇನ್‌ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಕಾನ್ಫಿಗರ್ ಮಾಡಿ"</string>
<string name="language_selection_title" msgid="3666971864764478269">"ಭಾಷೆಗಳು"</string>
- <string name="help_and_feedback" msgid="5328219371839879161">"ಸಹಾಯ &amp; ಪ್ರತಿಕ್ರಿಯೆ"</string>
+ <string name="help_and_feedback" msgid="5328219371839879161">"ಸಹಾಯ ಮತ್ತು ಪ್ರತಿಕ್ರಿಯೆ"</string>
<string name="select_language" msgid="5709487854987078367">"ಭಾಷೆಗಳು"</string>
<string name="hint_add_to_dictionary" msgid="2645988432867033007">"ಉಳಿಸಲು ಮತ್ತೊಮ್ಮೆ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
<string name="hint_add_to_dictionary_without_word" msgid="6710206006427574423">"ಉಳಿಸಲು ಇಲ್ಲಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
@@ -201,8 +201,8 @@
<string name="user_dict_settings_add_locale_option_name" msgid="4738643440987277705">"ಭಾಷೆ:"</string>
<string name="user_dict_settings_add_word_hint" msgid="4902434148985906707">"ಪದವನ್ನು ಟೈಪ್ ಮಾಡಿ"</string>
<string name="user_dict_settings_add_shortcut_hint" msgid="2265453012555060178">"ಐಚ್ಛಿಕ ಶಾರ್ಟ್‌ಕಟ್"</string>
- <string name="user_dict_settings_edit_dialog_title" msgid="3765774633869590352">"ಪದವನ್ನು ಸಂಪಾದಿಸಿ"</string>
- <string name="user_dict_settings_context_menu_edit_title" msgid="6812255903472456302">"ಸಂಪಾದಿಸಿ"</string>
+ <string name="user_dict_settings_edit_dialog_title" msgid="3765774633869590352">"ಪದವನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string>
+ <string name="user_dict_settings_context_menu_edit_title" msgid="6812255903472456302">"ಎಡಿಟ್"</string>
<string name="user_dict_settings_context_menu_delete_title" msgid="8142932447689461181">"ಅಳಿಸು"</string>
<string name="user_dict_settings_empty_text" msgid="6889278304342592383">"ಬಳಕೆದಾರರ ನಿಘಂಟಿನಲ್ಲಿ ನೀವು ಯಾವುದೇ ಪದಗಳನ್ನು ಹೊಂದಿಲ್ಲ. ಪದವನ್ನು ಸೇರಿಸಲು, ಸೇರಿಸು (+) ಬಟನ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
<string name="user_dict_settings_all_languages" msgid="8276126583216298886">"ಎಲ್ಲ ಭಾಷೆಗಳಿಗೆ"</string>
diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml
index 3de88aeea..220bd0ce4 100644
--- a/java/res/values-ko/strings.xml
+++ b/java/res/values-ko/strings.xml
@@ -89,7 +89,7 @@
<string name="voice_input_disabled_summary" msgid="6323489602945135165">"사용 설정된 음성 입력 방법이 없습니다. 언어 및 입력 설정을 확인하세요."</string>
<string name="configure_input_method" msgid="373356270290742459">"입력 방법 설정"</string>
<string name="language_selection_title" msgid="3666971864764478269">"언어"</string>
- <string name="help_and_feedback" msgid="5328219371839879161">"도움말 및 의견"</string>
+ <string name="help_and_feedback" msgid="5328219371839879161">"고객센터"</string>
<string name="select_language" msgid="5709487854987078367">"언어"</string>
<string name="hint_add_to_dictionary" msgid="2645988432867033007">"저장하려면 다시 탭합니다."</string>
<string name="hint_add_to_dictionary_without_word" msgid="6710206006427574423">"저장하려면 여기를 탭합니다."</string>
diff --git a/java/res/values-mn-rMN/strings.xml b/java/res/values-mn-rMN/strings.xml
index e9004811a..de3aee646 100644
--- a/java/res/values-mn-rMN/strings.xml
+++ b/java/res/values-mn-rMN/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">"Англи (ИБ)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Англи (АНУ)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Испани (АНУ)"</string>
diff --git a/java/res/values-mr-rIN/strings.xml b/java/res/values-mr-rIN/strings.xml
index 2093e14fb..5ae9ae8fb 100644
--- a/java/res/values-mr-rIN/strings.xml
+++ b/java/res/values-mr-rIN/strings.xml
@@ -152,7 +152,7 @@
<string name="setup_step2_title" msgid="6860725447906690594">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> वर स्विच करा"</string>
<string name="setup_step2_instruction" msgid="9141481964870023336">"पुढे, आपली सक्रिय मजकूर-इनपुट पद्धत म्हणून \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" निवडा."</string>
<string name="setup_step2_action" msgid="1660330307159824337">"इनपुट पद्धती स्विच करा"</string>
- <string name="setup_step3_title" msgid="3154757183631490281">"अभिनंदन, आता आपण सज्ज आहात!"</string>
+ <string name="setup_step3_title" msgid="3154757183631490281">"अभिनंदन, आता आपण तयार आहात!"</string>
<string name="setup_step3_instruction" msgid="8025981829605426000">"आता आपण <xliff:g id="APPLICATION_NAME">%s</xliff:g> सह आपल्या सर्व आवडत्या अॅप्समध्ये टाइप करू शकता."</string>
<string name="setup_step3_action" msgid="600879797256942259">"अतिरिक्त भाषा कॉन्फिगर करा"</string>
<string name="setup_finish_action" msgid="276559243409465389">"समाप्त"</string>
diff --git a/java/res/values-my-rMM/strings-action-keys.xml b/java/res/values-my-rMM/strings-action-keys.xml
index d15c9e55e..9057bfb89 100644
--- a/java/res/values-my-rMM/strings-action-keys.xml
+++ b/java/res/values-my-rMM/strings-action-keys.xml
@@ -21,7 +21,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="label_go_key" msgid="4033615332628671065">"သွားပါ"</string>
- <string name="label_next_key" msgid="5586407279258592635">"ရှေ့ဆက်ရန်"</string>
+ <string name="label_next_key" msgid="5586407279258592635">"ရှေ့"</string>
<string name="label_previous_key" msgid="1421141755779895275">"ယခင်က"</string>
<string name="label_done_key" msgid="7564866296502630852">"လုပ်ပြီး"</string>
<string name="label_send_key" msgid="482252074224462163">"ပို့ရန်"</string>
diff --git a/java/res/values-my-rMM/strings-emoji-descriptions.xml b/java/res/values-my-rMM/strings-emoji-descriptions.xml
index e1007bffb..e95fe68d7 100644
--- a/java/res/values-my-rMM/strings-emoji-descriptions.xml
+++ b/java/res/values-my-rMM/strings-emoji-descriptions.xml
@@ -263,7 +263,7 @@
<string name="spoken_emoji_1F235" msgid="5320186982841793711">"အပြည့်အဝလုပ်ဆောင်ခြင်း အရုပ်စာ လေးထောင့်ကွက်"</string>
<string name="spoken_emoji_1F236" msgid="879755752069393034">"Squared သင်္ကေတပေးချေပြီး"</string>
<string name="spoken_emoji_1F237" msgid="6741807001205851437">"လစဉ် အရုပ်စာ လေးထောင့်ကွက်"</string>
- <string name="spoken_emoji_1F238" msgid="5504414186438196912">"အက်ပ် အရုပ်စာ လေးထောင့်ကွက်"</string>
+ <string name="spoken_emoji_1F238" msgid="5504414186438196912">"အပလီကေးရှင်းအရုပ်စာ လေးထောင့်ကွက်"</string>
<string name="spoken_emoji_1F239" msgid="1634067311597618959">"လျှော့ဈေး အရုပ်စာ လေးထောင့်ကွက်"</string>
<string name="spoken_emoji_1F23A" msgid="3107862957630169536">"စီးပွားရေးတွင် အရုပ်စာ လေးထောင့်ကွက်"</string>
<string name="spoken_emoji_1F250" msgid="6586943922806727907">"စက်ဝိုင်းအရုပ်စာ အားသာမှု"</string>
diff --git a/java/res/values-my-rMM/strings-talkback-descriptions.xml b/java/res/values-my-rMM/strings-talkback-descriptions.xml
index bcb034395..cbaf1634e 100644
--- a/java/res/values-my-rMM/strings-talkback-descriptions.xml
+++ b/java/res/values-my-rMM/strings-talkback-descriptions.xml
@@ -76,7 +76,7 @@
<string name="spoken_descrption_emoji_category_eight_animals_nature" msgid="5844950234883716704">"တိရိစ္ဆာတ် &amp; သဘာဝ"</string>
<string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"အစားအစာ &amp; သောက်စရာ"</string>
<string name="spoken_descrption_emoji_category_eight_travel_places" msgid="3834085499381434611">"ခရီးသွား &amp; နေရာများ"</string>
- <string name="spoken_descrption_emoji_category_eight_activity" msgid="4795281669042975993">"လှုပ်ရှားမှု"</string>
+ <string name="spoken_descrption_emoji_category_eight_activity" msgid="4795281669042975993">"လုပ်ဆောင်ချက်"</string>
<string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"ခံစားချက်ရုပ်ပုံများ"</string>
<string name="spoken_description_upper_case" msgid="4904835255229433916">"စာလုံးကြီး <xliff:g id="LOWER_LETTER">%s</xliff:g>"</string>
<string name="spoken_letter_0049" msgid="4743162182646977944">"I အကြီး"</string>
diff --git a/java/res/values-my-rMM/strings.xml b/java/res/values-my-rMM/strings.xml
index 14002a4a4..499fd2b80 100644
--- a/java/res/values-my-rMM/strings.xml
+++ b/java/res/values-my-rMM/strings.xml
@@ -42,7 +42,7 @@
<string name="clear_sync_data_summary" msgid="993477139012576584">"သင်၏ စင့်က် လုပ်ပြီးသား ဒေတာ Google ထဲမှ ဖျက်ခံရမည်။"</string>
<string name="clear_sync_data_confirmation" msgid="2811931135574727678">"သင့် စင့်လုပ်ထားသော ဒေတာများအား cloud မှ ဖျက်လိမ့်မည်။ သေချာသလား?"</string>
<string name="clear_sync_data_ok" msgid="613104067705915132">"ဖျက်ရန်"</string>
- <string name="cloud_sync_cancel" msgid="5877481252150919037">"မလုပ်တော့ပါ"</string>
+ <string name="cloud_sync_cancel" msgid="5877481252150919037">"မလုပ်တော့"</string>
<string name="cloud_sync_opt_in_text" msgid="9176039655776298248">"သင့်ရဲ့ကိုယ်ပိုင်အဘိဓါန်ကို Google server များမှာ ထပ်တူညီအောင်လုပ် ပြီး မူလပုံစံ ပြန်သွားမည်။ အိုင်တီထုတ်ကုန်များ တိုးတက်မှုရှိအောင် စာလုံးရေ ကောက်ယူမှု အချက်အလက်ကို စုစည်းပါသည်။ အဆိုပါအချက်အလက်စုယူ သုံးစွဲမှုကို "<a href="https://www.google.com/policies/privacy">" Google၏မိမိအတွင်းရေးသီးသန့် မူဝါဒ "</a>" ဖြင့် စောဒကတက် နိုင်သည်။"</string>
<string name="add_account_to_enable_sync" msgid="7836932571852055265">"ဒီအင်္ဂါရပ်တွေကို ရဖို့ဒီစက်မှာ Google account တစ်ခုကို ဖွင့်ပါ"</string>
<string name="cloud_sync_summary_disabled_work_profile" msgid="1381770407303129164">"စီးပွားရေးအကောင့်များအတွက် Google အပ်ဖ်များဖြင့် စက်ပစ္စည်းများတွင် ထပ်တူပြုခြင်း မရနိုင်ပါ"</string>
@@ -50,7 +50,7 @@
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"ဘာသာပြောင်းသည့် ကီးသည် အခြားထည့်သွင်းရန် နည်းလမ်းများလည်း ပါဝင်သည်"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"ဘာသာစကား ပြောင်းခလုတ်"</string>
<string name="show_language_switch_key_summary" msgid="7343403647474265713">"များပြားသည့် ထည့်သွင်းရန်နည်းလမ်းများဖွင့်ထားလျှင် ပြပါ"</string>
- <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"ကီးပေါ်လာ၍ ဖျောက်ရန်နှုန်း"</string>
+ <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"ကီးပေါ်လာ၍ ပယ်ရန်နှုန်း"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"နောက်မကျ"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"မူရင်းအတိုင်း"</string>
<string name="abbreviation_unit_milliseconds" msgid="8700286094028323363">"<xliff:g id="MILLISECONDS">%s</xliff:g>ms"</string>
@@ -99,7 +99,7 @@
<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_cancel" msgid="5181012062618504340">"မလုပ်တော့ပါ"</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="subtype_en_GB" msgid="88170601942311355">"အင်္ဂလိပ်(ယူကေ)"</string>
@@ -127,7 +127,7 @@
<string name="add_style" msgid="6163126614514489951">"စတိုင်လ်ထည့်ရန်"</string>
<string name="add" msgid="8299699805688017798">"ထည့်ရန်"</string>
<string name="remove" msgid="4486081658752944606">"ဖယ်ရှားပါ"</string>
- <string name="save" msgid="7646738597196767214">"သိမ်းပါ"</string>
+ <string name="save" msgid="7646738597196767214">"သိမ်းရန်"</string>
<string name="subtype_locale" msgid="8576443440738143764">"ဘာသာစကား"</string>
<string name="keyboard_layout_set" msgid="4309233698194565609">"အဆင်အပြင်"</string>
<string name="custom_input_style_note_message" msgid="8826731320846363423">"သင့်စိတ်ကြိုက် ထည့်သွင်းမှုစတိုင်လ်အား စတင် အသုံးမပြုမှီ ဖွင့်ရပါမည်။ ၎င်းအားယခု ဖွင့်လိုပါသလား?"</string>
@@ -157,11 +157,11 @@
<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">"launcher တွင်နေ့စဉ် အပလီကေးရှင်းအိုင်ကွန် ပြရန်"</string>
+ <string name="show_setup_wizard_icon_summary" msgid="4119998322536880213">"launcher တွင် အပလီကေးရှင်း သင်္ကေတကိုပြရန်"</string>
<string name="app_name" msgid="6320102637491234792">"အဘိဓါန် ထောက်ပံ့သူ"</string>
<string name="dictionary_provider_name" msgid="3027315045397363079">"အဘိဓါန် ထောက်ပံ့သူ"</string>
<string name="dictionary_service_name" msgid="6237472350693511448">"အဘိဓါန် ဝန်ဆောင်မှု"</string>
- <string name="download_description" msgid="6014835283119198591">"အဘိဓါန် အသစ်မွမ်းမံရန် အချက်လက်"</string>
+ <string name="download_description" msgid="6014835283119198591">"အဘိဓာန် အသစ်အပ်ဒိတ်လုပ်ရန် အချက်အလက်"</string>
<string name="dictionary_settings_title" msgid="8091417676045693313">"ပေါင်းထည့်ထားသည့် အဘိဓါန်များ"</string>
<string name="dictionary_install_over_metered_network_prompt" msgid="3587517870006332980">"အဘိဓါန်ရနိုင်"</string>
<string name="dictionary_settings_summary" msgid="5305694987799824349">"အဘိဓါန်များအတွက် ဆက်တင်များ"</string>
@@ -178,10 +178,10 @@
<string name="message_updating" msgid="4457761393932375219">"အသစ်မွမ်းမံမှုကို ရှာဖွေနေ"</string>
<string name="message_loading" msgid="5638680861387748936">"တင်နေ…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"အဓိက အဘိဓါန်"</string>
- <string name="cancel" msgid="6830980399865683324">"မလုပ်တော့ပါ"</string>
+ <string name="cancel" msgid="6830980399865683324">"မလုပ်တော့"</string>
<string name="go_to_settings" msgid="3876892339342569259">"ဆက်တင်များ"</string>
<string name="install_dict" msgid="180852772562189365">"တပ်ဆင်ပါ"</string>
- <string name="cancel_download_dict" msgid="7843340278507019303">"မလုပ်တော့ပါ"</string>
+ <string name="cancel_download_dict" msgid="7843340278507019303">"မလုပ်တော့"</string>
<string name="delete_dict" msgid="756853268088330054">"ဖျက်ရန်"</string>
<string name="should_download_over_metered_prompt" msgid="6737084685073734292">"သင့်မိုဘိုင်းစက်ပစ္စည်းပေါ်တွင် ရွေးချယ်ထားသည့် ဘာသာစကားအတွက် ရရှိနိုင်သည့် အဘိဓာန်တစ်ခု ရှိပါသည်။&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;Settings&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>
@@ -207,6 +207,6 @@
<string name="user_dict_settings_empty_text" msgid="6889278304342592383">"အသုံးပြုသူ အဘိဓာန်တွင် မည်သည့်စကားလုံးမျှ မရှိပါ။ စကားလုံးကိုပေါင်းထည့်ရန် (+) ခလုတ် ကိုတို့ပါ။"</string>
<string name="user_dict_settings_all_languages" msgid="8276126583216298886">"ဘာသာစကားအားလုံးအတွက်"</string>
<string name="user_dict_settings_more_languages" msgid="7131268499685180461">"ဘာသာစကားပိုများများ…"</string>
- <string name="user_dict_settings_delete" msgid="110413335187193859">"မလုပ်တော့ပါ"</string>
+ <string name="user_dict_settings_delete" msgid="110413335187193859">"ဖျက်ရန်"</string>
<string name="user_dict_fast_scroll_alphabet" msgid="5431919401558285473">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
</resources>
diff --git a/java/res/values-sk/strings-emoji-descriptions.xml b/java/res/values-sk/strings-emoji-descriptions.xml
index 2fc574cf1..3afb3cd00 100644
--- a/java/res/values-sk/strings-emoji-descriptions.xml
+++ b/java/res/values-sk/strings-emoji-descriptions.xml
@@ -365,7 +365,7 @@
<string name="spoken_emoji_1F352" msgid="965600953360182635">"Čerešne"</string>
<string name="spoken_emoji_1F353" msgid="7068623879906925592">"Jahoda"</string>
<string name="spoken_emoji_1F354" msgid="45162285238888494">"Hamburger"</string>
- <string name="spoken_emoji_1F355" msgid="9157587635526433283">"Kúsok pizze"</string>
+ <string name="spoken_emoji_1F355" msgid="9157587635526433283">"Kúsok pizzy"</string>
<string name="spoken_emoji_1F356" msgid="2667196119149852244">"Mäso na kosti"</string>
<string name="spoken_emoji_1F357" msgid="8022817413851052256">"Hydinové stehno"</string>
<string name="spoken_emoji_1F358" msgid="3042693264748036476">"Ryžový kreker"</string>
diff --git a/java/res/values-sr/strings-emoji-descriptions.xml b/java/res/values-sr/strings-emoji-descriptions.xml
index f47bd0605..5a6dab25e 100644
--- a/java/res/values-sr/strings-emoji-descriptions.xml
+++ b/java/res/values-sr/strings-emoji-descriptions.xml
@@ -651,7 +651,7 @@
<string name="spoken_emoji_1F449" msgid="4764447975177805991">"Спољни део беле шаке са кажипрстом надесно"</string>
<string name="spoken_emoji_1F44A" msgid="7197417095486424841">"Песница"</string>
<string name="spoken_emoji_1F44B" msgid="1975968945250833117">"Рука која маше"</string>
- <string name="spoken_emoji_1F44C" msgid="3185919567897876562">"Знак руком „У реду“"</string>
+ <string name="spoken_emoji_1F44C" msgid="3185919567897876562">"Знак руком „Потврди“"</string>
<string name="spoken_emoji_1F44D" msgid="6182553970602667815">"Палац окренут нагоре"</string>
<string name="spoken_emoji_1F44E" msgid="8030851867365111809">"Палац окренут надоле"</string>
<string name="spoken_emoji_1F44F" msgid="5148753662268213389">"Тапшање"</string>
diff --git a/java/res/values-tl/strings.xml b/java/res/values-tl/strings.xml
index 9adc9eb1d..95f0959eb 100644
--- a/java/res/values-tl/strings.xml
+++ b/java/res/values-tl/strings.xml
@@ -103,7 +103,7 @@
<string name="account_select_sign_out" msgid="3299651159390187933">"Mag-sign out"</string>
<string name="account_select_title" msgid="6279711684772922649">"Pumili ng account na gagamitin"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"English (UK)"</string>
- <string name="subtype_en_US" msgid="6160452336634534239">"English (Estados Unidos)"</string>
+ <string name="subtype_en_US" msgid="6160452336634534239">"English (United States)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Spanish (US)"</string>
<string name="subtype_hi_ZZ" msgid="8860448146262798623">"Hinglish"</string>
<string name="subtype_sr_ZZ" msgid="9059219552986034343">"Serbian (Latin)"</string>
diff --git a/java/res/values-zh-rCN/important_notice_strings.xml b/java/res/values-zh-rCN/important_notice_strings.xml
new file mode 100644
index 000000000..63caa26fc
--- /dev/null
+++ b/java/res/values-zh-rCN/important_notice_strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<resources>
+ <!-- The text shown on the suggestion bar to request the contacts permission info. -->
+ <string name="important_notice_suggest_contact_names">建议联系人姓名?触摸以查看其信息。</string>
+</resources> \ No newline at end of file
diff --git a/java/res/values-zh-rTW/strings-emoji-descriptions.xml b/java/res/values-zh-rTW/strings-emoji-descriptions.xml
index d9b447ae9..fe8056d3b 100644
--- a/java/res/values-zh-rTW/strings-emoji-descriptions.xml
+++ b/java/res/values-zh-rTW/strings-emoji-descriptions.xml
@@ -747,7 +747,7 @@
<string name="spoken_emoji_1F4A9" msgid="1240958472788430032">"一坨便便"</string>
<string name="spoken_emoji_1F4AA" msgid="8427525538635146416">"股起的二頭肌"</string>
<string name="spoken_emoji_1F4AB" msgid="5484114759939427459">"暈眩符號"</string>
- <string name="spoken_emoji_1F4AC" msgid="5571196638219612682">"對話泡泡框"</string>
+ <string name="spoken_emoji_1F4AC" msgid="5571196638219612682">"對話框"</string>
<string name="spoken_emoji_1F4AD" msgid="353174619257798652">"思考泡泡框"</string>
<string name="spoken_emoji_1F4AE" msgid="1223142786927162641">"白花"</string>
<string name="spoken_emoji_1F4AF" msgid="3526278354452138397">"一百分符號"</string>
diff --git a/java/res/values-zh-rTW/strings-talkback-descriptions.xml b/java/res/values-zh-rTW/strings-talkback-descriptions.xml
index a04fbaad3..3a722237c 100644
--- a/java/res/values-zh-rTW/strings-talkback-descriptions.xml
+++ b/java/res/values-zh-rTW/strings-talkback-descriptions.xml
@@ -74,7 +74,7 @@
<string name="spoken_descrption_emoji_category_flags" msgid="5971573825866381472">"旗幟"</string>
<string name="spoken_descrption_emoji_category_eight_smiley_people" msgid="5682663819532433464">"表情符號與人物"</string>
<string name="spoken_descrption_emoji_category_eight_animals_nature" msgid="5844950234883716704">"動物與大自然"</string>
- <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"飲食"</string>
+ <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"美食佳飲"</string>
<string name="spoken_descrption_emoji_category_eight_travel_places" msgid="3834085499381434611">"旅行與地點"</string>
<string name="spoken_descrption_emoji_category_eight_activity" msgid="4795281669042975993">"活動"</string>
<string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"表情"</string>